71090 2011-10-27 19:54:21 -0700 Remove some unnecessary loads/stores in DFG JIT 32_64 2011-11-02 18:53:27 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 yuqiang.xian webkit-unassigned barraclough fpizlo webkit.review.bot oldest_to_newest 492210 0 yuqiang.xian 2011-10-27 19:54:21 -0700 In fillSpeculateCell and OSR exit, some unnecessary loads/stores can be eliminated. 492213 1 112808 yuqiang.xian 2011-10-27 19:58:20 -0700 Created attachment 112808 the patch 495088 2 112808 fpizlo 2011-11-02 17:23:56 -0700 Comment on attachment 112808 the patch r=me 495090 3 112808 webkit.review.bot 2011-11-02 17:26:14 -0700 Comment on attachment 112808 the patch Rejecting attachment 112808 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ed at 1 with fuzz 3. patching file Source/JavaScriptCore/dfg/DFGJITCompiler32_64.cpp Hunk #1 succeeded at 237 (offset 24 lines). Hunk #2 succeeded at 373 (offset 24 lines). patching file Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp Hunk #1 FAILED at 295. 1 out of 1 hunk FAILED -- saving rejects to file Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Filip Pizlo', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/10257430 495091 4 fpizlo 2011-11-02 17:27:28 -0700 Looks like this needs some merging, since I touched some of that same code. Yuqiang, can you merge this and land manually? R=me still applies. 495097 5 113407 yuqiang.xian 2011-11-02 17:32:27 -0700 Created attachment 113407 patch patch merging the latest changes. 495098 6 yuqiang.xian 2011-11-02 17:34:10 -0700 (In reply to comment #4) > Looks like this needs some merging, since I touched some of that same code. Yuqiang, can you merge this and land manually? R=me still applies. Thanks, the new patch has been uploaded. Can you please set cq+ if you're fine with it? I still don't have the commit access (though it's in process) by now. 495134 7 113407 webkit.review.bot 2011-11-02 18:53:22 -0700 Comment on attachment 113407 patch Clearing flags on attachment: 113407 Committed r99129: <http://trac.webkit.org/changeset/99129> 495135 8 webkit.review.bot 2011-11-02 18:53:27 -0700 All reviewed patches have been landed. Closing bug. 112808 2011-10-27 19:58:20 -0700 2011-11-02 17:32:27 -0700 the patch 71090.patch text/plain 6256 yuqiang.xian SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTg2ODEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAK KzIwMTEtMTAtMjcgIFl1cWlhbmcgWGlhbiAgPHl1cWlhbmcueGlhbkBpbnRlbC5jb20+CisKKyAg ICAgICAgUmVtb3ZlIHNvbWUgdW5uZWNlc3NhcnkgbG9hZHMvc3RvcmVzIGluIERGRyBKSVQgMzJf NjQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMDkw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gZmls bFNwZWN1bGF0ZUNlbGwgYW5kIE9TUiBleGl0LCBzb21lIHVubmVjZXNzYXJ5IGxvYWRzL3N0b3Jl cyBjYW4KKyAgICAgICAgYmUgZWxpbWluYXRlZC4KKworICAgICAgICAqIGRmZy9ERkdKSVRDb21w aWxlcjMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb21waWxlcjo6ZXhpdFNwZWN1 bGF0aXZlV2l0aE9TUik6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3Bw OgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpmaWxsU3BlY3VsYXRlQ2VsbCk6 CisKIDIwMTEtMTAtMjcgIERhbmllbCBCYXRlcyAgPGRiYXRlc0ByaW0uY29tPgogCiAgICAgICAg IENNYWtlOiBBZGQgc3VwcG9ydCB0byBvcHRpb25hbGx5IGluc3RhbGwgdGhlIGJ1aWx0IEphdmFT Y3JpcHQgc2hlbGwKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGls ZXIzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdK SVRDb21waWxlcjMyXzY0LmNwcAkocmV2aXNpb24gOTg2NzgpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0pJVENvbXBpbGVyMzJfNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTMs MzIgKzIxMywxOSBAQCB2b2lkIEpJVENvbXBpbGVyOjpleGl0U3BlY3VsYXRpdmVXaXRoT1NSCiAg ICAgICAgIGludCBvcGVyYW5kID0gZXhpdC5vcGVyYW5kRm9ySW5kZXgoaW5kZXgpOwogICAgICAg ICBzd2l0Y2ggKHJlY292ZXJ5LnRlY2huaXF1ZSgpKSB7CiAgICAgICAgIGNhc2UgSW5HUFI6Ci0g ICAgICAgICAgICBpZiAoZXhpdC5pc1ZhcmlhYmxlKGluZGV4KSAmJiBwb2lzb25lZFZpcnR1YWxS ZWdpc3RlcnNbZXhpdC52YXJpYWJsZUZvckluZGV4KGluZGV4KV0pIHsKLSAgICAgICAgICAgICAg ICBzdG9yZTMyKFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpDZWxsVGFnKSwgcmVpbnRlcnByZXRfY2Fz dDxjaGFyKj4oc2NyYXRjaEJ1ZmZlciArIHNjcmF0Y2hJbmRleCkgKyBPQkpFQ1RfT0ZGU0VUT0Yo RW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnRhZykpOwotICAgICAgICAgICAgICAgIHN0 b3JlMzIocmVjb3ZlcnkuZ3ByKCksIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KHNjcmF0Y2hCdWZm ZXIgKyBzY3JhdGNoSW5kZXgpICsgT0JKRUNUX09GRlNFVE9GKEVuY29kZWRWYWx1ZURlc2NyaXB0 b3IsIGFzQml0cy5wYXlsb2FkKSk7Ci0gICAgICAgICAgICAgICAgc2NyYXRjaEluZGV4Kys7Ci0g ICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHN0b3JlMzIoVHJ1c3RlZEltbTMy KEpTVmFsdWU6OkNlbGxUYWcpLCB0YWdGb3IoKFZpcnR1YWxSZWdpc3RlcilvcGVyYW5kKSk7Ci0g ICAgICAgICAgICAgICAgc3RvcmUzMihyZWNvdmVyeS5ncHIoKSwgcGF5bG9hZEZvcigoVmlydHVh bFJlZ2lzdGVyKW9wZXJhbmQpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIFVuYm94ZWRJbnQzMkluR1BSOgotICAgICAgICAgICAgaWYgKGV4aXQuaXNW YXJpYWJsZShpbmRleCkgJiYgcG9pc29uZWRWaXJ0dWFsUmVnaXN0ZXJzW2V4aXQudmFyaWFibGVG b3JJbmRleChpbmRleCldKSB7Ci0gICAgICAgICAgICAgICAgc3RvcmUzMihUcnVzdGVkSW1tMzIo SlNWYWx1ZTo6SW50MzJUYWcpLCByZWludGVycHJldF9jYXN0PGNoYXIqPihzY3JhdGNoQnVmZmVy ICsgc2NyYXRjaEluZGV4KSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNjcmlwdG9y LCBhc0JpdHMudGFnKSk7Ci0gICAgICAgICAgICAgICAgc3RvcmUzMihyZWNvdmVyeS5ncHIoKSwg cmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oc2NyYXRjaEJ1ZmZlciArIHNjcmF0Y2hJbmRleCkgKyBP QkpFQ1RfT0ZGU0VUT0YoRW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnBheWxvYWQpKTsK LSAgICAgICAgICAgICAgICBzY3JhdGNoSW5kZXgrKzsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAgICAgc3RvcmUzMihUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6SW50MzJUYWcpLCB0 YWdGb3IoKFZpcnR1YWxSZWdpc3RlcilvcGVyYW5kKSk7Ci0gICAgICAgICAgICAgICAgc3RvcmUz MihyZWNvdmVyeS5ncHIoKSwgcGF5bG9hZEZvcigoVmlydHVhbFJlZ2lzdGVyKW9wZXJhbmQpKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFVuYm94ZWRC b29sZWFuSW5HUFI6Ci0gICAgICAgICAgICBpZiAoZXhpdC5pc1ZhcmlhYmxlKGluZGV4KSAmJiBw b2lzb25lZFZpcnR1YWxSZWdpc3RlcnNbZXhpdC52YXJpYWJsZUZvckluZGV4KGluZGV4KV0pIHsK LSAgICAgICAgICAgICAgICBzdG9yZTMyKFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpCb29sZWFuVGFn KSwgcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oc2NyYXRjaEJ1ZmZlciArIHNjcmF0Y2hJbmRleCkg KyBPQkpFQ1RfT0ZGU0VUT0YoRW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnRhZykpOwot ICAgICAgICAgICAgICAgIHN0b3JlMzIocmVjb3ZlcnkuZ3ByKCksIHJlaW50ZXJwcmV0X2Nhc3Q8 Y2hhcio+KHNjcmF0Y2hCdWZmZXIgKyBzY3JhdGNoSW5kZXgpICsgT0JKRUNUX09GRlNFVE9GKEVu Y29kZWRWYWx1ZURlc2NyaXB0b3IsIGFzQml0cy5wYXlsb2FkKSk7Ci0gICAgICAgICAgICAgICAg c2NyYXRjaEluZGV4Kys7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHN0 b3JlMzIoVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkJvb2xlYW5UYWcpLCB0YWdGb3IoKFZpcnR1YWxS ZWdpc3RlcilvcGVyYW5kKSk7CisgICAgICAgICAgICBpZiAoZXhpdC5pc1ZhcmlhYmxlKGluZGV4 KSAmJiBwb2lzb25lZFZpcnR1YWxSZWdpc3RlcnNbZXhpdC52YXJpYWJsZUZvckluZGV4KGluZGV4 KV0pCisgICAgICAgICAgICAgICAgc3RvcmUzMihyZWNvdmVyeS5ncHIoKSwgcmVpbnRlcnByZXRf Y2FzdDxjaGFyKj4oc2NyYXRjaEJ1ZmZlciArIHNjcmF0Y2hJbmRleCsrKSArIE9CSkVDVF9PRkZT RVRPRihFbmNvZGVkVmFsdWVEZXNjcmlwdG9yLCBhc0JpdHMucGF5bG9hZCkpOworICAgICAgICAg ICAgZWxzZSB7CisgICAgICAgICAgICAgICAgdWludDMyX3QgdGFnID0gSlNWYWx1ZTo6RW1wdHlW YWx1ZVRhZzsKKyAgICAgICAgICAgICAgICBpZiAocmVjb3ZlcnkudGVjaG5pcXVlKCkgPT0gSW5H UFIpCisgICAgICAgICAgICAgICAgICAgIHRhZyA9IEpTVmFsdWU6OkNlbGxUYWc7CisgICAgICAg ICAgICAgICAgZWxzZSBpZiAocmVjb3ZlcnkudGVjaG5pcXVlKCkgPT0gVW5ib3hlZEludDMySW5H UFIpCisgICAgICAgICAgICAgICAgICAgIHRhZyA9IEpTVmFsdWU6OkludDMyVGFnOworICAgICAg ICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgdGFnID0gSlNWYWx1ZTo6Qm9vbGVh blRhZzsKKyAgICAgICAgICAgICAgICBzdG9yZTMyKFRydXN0ZWRJbW0zMih0YWcpLCB0YWdGb3Io KFZpcnR1YWxSZWdpc3RlcilvcGVyYW5kKSk7CiAgICAgICAgICAgICAgICAgc3RvcmUzMihyZWNv dmVyeS5ncHIoKSwgcGF5bG9hZEZvcigoVmlydHVhbFJlZ2lzdGVyKW9wZXJhbmQpKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwpAQCAtMzYyLDcgKzM0OSwyMCBAQCB2b2lkIEpJ VENvbXBpbGVyOjpleGl0U3BlY3VsYXRpdmVXaXRoT1NSCiAgICAgICAgICAgICBzd2l0Y2ggKHJl Y292ZXJ5LnRlY2huaXF1ZSgpKSB7CiAgICAgICAgICAgICBjYXNlIEluR1BSOgogICAgICAgICAg ICAgY2FzZSBVbmJveGVkSW50MzJJbkdQUjoKLSAgICAgICAgICAgIGNhc2UgVW5ib3hlZEJvb2xl YW5JbkdQUjoKKyAgICAgICAgICAgIGNhc2UgVW5ib3hlZEJvb2xlYW5JbkdQUjogeworICAgICAg ICAgICAgICAgIGxvYWQzMihyZWludGVycHJldF9jYXN0PGNoYXIqPihzY3JhdGNoQnVmZmVyICsg c2NyYXRjaEluZGV4KyspICsgT0JKRUNUX09GRlNFVE9GKEVuY29kZWRWYWx1ZURlc2NyaXB0b3Is IGFzQml0cy5wYXlsb2FkKSwgR1BSSW5mbzo6cmVnVDApOworICAgICAgICAgICAgICAgIHN0b3Jl MzIoR1BSSW5mbzo6cmVnVDAsIHBheWxvYWRGb3IoKFZpcnR1YWxSZWdpc3Rlcil2aXJ0dWFsUmVn aXN0ZXIpKTsKKyAgICAgICAgICAgICAgICB1aW50MzJfdCB0YWcgPSBKU1ZhbHVlOjpFbXB0eVZh bHVlVGFnOworICAgICAgICAgICAgICAgIGlmIChyZWNvdmVyeS50ZWNobmlxdWUoKSA9PSBJbkdQ UikKKyAgICAgICAgICAgICAgICAgICAgdGFnID0gSlNWYWx1ZTo6Q2VsbFRhZzsKKyAgICAgICAg ICAgICAgICBlbHNlIGlmIChyZWNvdmVyeS50ZWNobmlxdWUoKSA9PSBVbmJveGVkSW50MzJJbkdQ UikKKyAgICAgICAgICAgICAgICAgICAgdGFnID0gSlNWYWx1ZTo6SW50MzJUYWc7CisgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB0YWcgPSBKU1ZhbHVlOjpCb29sZWFu VGFnOworICAgICAgICAgICAgICAgIHN0b3JlMzIoVHJ1c3RlZEltbTMyKHRhZyksIHRhZ0Zvcigo VmlydHVhbFJlZ2lzdGVyKXZpcnR1YWxSZWdpc3RlcikpOworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBjYXNlIEluRlBSOgogICAgICAgICAgICAg Y2FzZSBJblBhaXI6CiAgICAgICAgICAgICAgICAgbG9hZDMyKHJlaW50ZXJwcmV0X2Nhc3Q8Y2hh cio+KHNjcmF0Y2hCdWZmZXIgKyBzY3JhdGNoSW5kZXgpICsgT0JKRUNUX09GRlNFVE9GKEVuY29k ZWRWYWx1ZURlc2NyaXB0b3IsIGFzQml0cy5wYXlsb2FkKSwgR1BSSW5mbzo6cmVnVDApOwpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklU MzJfNjQuY3BwCShyZXZpc2lvbiA5ODY3OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5NSw5ICsyOTUs OCBAQCBHUFJSZWcgU3BlY3VsYXRpdmVKSVQ6OmZpbGxTcGVjdWxhdGVDZWxsCiAgICAgICAgICAg ICByZXR1cm4gZ3ByOwogICAgICAgICB9CiAgICAgICAgIEFTU0VSVChpbmZvLnNwaWxsRm9ybWF0 KCkgJiBEYXRhRm9ybWF0SlMpOwotICAgICAgICBtX2ppdC5sb2FkMzIoSklUQ29tcGlsZXI6OnRh Z0Zvcih2aXJ0dWFsUmVnaXN0ZXIpLCBncHIpOwogICAgICAgICBpZiAoaW5mby5zcGlsbEZvcm1h dCgpICE9IERhdGFGb3JtYXRKU0NlbGwpCi0gICAgICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKG1f aml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgZ3ByLCBUcnVzdGVkSW1tMzIo SlNWYWx1ZTo6Q2VsbFRhZykpKTsKKyAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2sobV9qaXQu YnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCBKSVRDb21waWxlcjo6dGFnRm9yKHZp cnR1YWxSZWdpc3RlciksIFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpDZWxsVGFnKSkpOwogICAgICAg ICBtX2ppdC5sb2FkMzIoSklUQ29tcGlsZXI6OnBheWxvYWRGb3IodmlydHVhbFJlZ2lzdGVyKSwg Z3ByKTsKICAgICAgICAgbV9ncHJzLnJldGFpbihncHIsIHZpcnR1YWxSZWdpc3RlciwgU3BpbGxP cmRlclNwaWxsZWQpOwogICAgICAgICBpbmZvLmZpbGxDZWxsKGdwcik7Cg== 113407 2011-11-02 17:32:27 -0700 2011-11-02 18:53:22 -0700 patch 71090.1.patch text/plain 6378 yuqiang.xian SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTkxMjYpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAK KzIwMTEtMTAtMjcgIFl1cWlhbmcgWGlhbiAgPHl1cWlhbmcueGlhbkBpbnRlbC5jb20+CisKKyAg ICAgICAgUmVtb3ZlIHNvbWUgdW5uZWNlc3NhcnkgbG9hZHMvc3RvcmVzIGluIERGRyBKSVQgMzJf NjQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMDkw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gZmls bFNwZWN1bGF0ZUNlbGwgYW5kIE9TUiBleGl0LCBzb21lIHVubmVjZXNzYXJ5IGxvYWRzL3N0b3Jl cyBjYW4KKyAgICAgICAgYmUgZWxpbWluYXRlZC4KKworICAgICAgICAqIGRmZy9ERkdKSVRDb21w aWxlcjMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpKSVRDb21waWxlcjo6ZXhpdFNwZWN1 bGF0aXZlV2l0aE9TUik6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3Bw OgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpmaWxsU3BlY3VsYXRlQ2VsbCk6 CisKIDIwMTEtMTEtMDIgIE1hcmsgSGFobmVuYmVyZyAgPG1oYWhuZW5iZXJnQGFwcGxlLmNvbT4K IAogICAgICAgICBEZS12aXJ0dWFsaXplIEpTT2JqZWN0OjpnZXRPd25Qcm9wZXJ0eU5hbWVzCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvbXBpbGVyMzJfNjQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIzMl82 NC5jcHAJKHJldmlzaW9uIDk5MTI2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdK SVRDb21waWxlcjMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM3LDMyICsyMzcsMTkgQEAg dm9pZCBKSVRDb21waWxlcjo6ZXhpdFNwZWN1bGF0aXZlV2l0aE9TUgogICAgICAgICBpbnQgb3Bl cmFuZCA9IGV4aXQub3BlcmFuZEZvckluZGV4KGluZGV4KTsKICAgICAgICAgc3dpdGNoIChyZWNv dmVyeS50ZWNobmlxdWUoKSkgewogICAgICAgICBjYXNlIEluR1BSOgotICAgICAgICAgICAgaWYg KGV4aXQuaXNWYXJpYWJsZShpbmRleCkgJiYgcG9pc29uZWRWaXJ0dWFsUmVnaXN0ZXJzW2V4aXQu dmFyaWFibGVGb3JJbmRleChpbmRleCldKSB7Ci0gICAgICAgICAgICAgICAgc3RvcmUzMihUcnVz dGVkSW1tMzIoSlNWYWx1ZTo6Q2VsbFRhZyksIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KHNjcmF0 Y2hCdWZmZXIgKyBzY3JhdGNoSW5kZXgpICsgT0JKRUNUX09GRlNFVE9GKEVuY29kZWRWYWx1ZURl c2NyaXB0b3IsIGFzQml0cy50YWcpKTsKLSAgICAgICAgICAgICAgICBzdG9yZTMyKHJlY292ZXJ5 LmdwcigpLCByZWludGVycHJldF9jYXN0PGNoYXIqPihzY3JhdGNoQnVmZmVyICsgc2NyYXRjaElu ZGV4KSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNjcmlwdG9yLCBhc0JpdHMucGF5 bG9hZCkpOwotICAgICAgICAgICAgICAgIHNjcmF0Y2hJbmRleCsrOwotICAgICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgICAgICBzdG9yZTMyKFRydXN0ZWRJbW0zMihKU1ZhbHVlOjpDZWxs VGFnKSwgdGFnRm9yKChWaXJ0dWFsUmVnaXN0ZXIpb3BlcmFuZCkpOwotICAgICAgICAgICAgICAg IHN0b3JlMzIocmVjb3ZlcnkuZ3ByKCksIHBheWxvYWRGb3IoKFZpcnR1YWxSZWdpc3RlcilvcGVy YW5kKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBV bmJveGVkSW50MzJJbkdQUjoKLSAgICAgICAgICAgIGlmIChleGl0LmlzVmFyaWFibGUoaW5kZXgp ICYmIHBvaXNvbmVkVmlydHVhbFJlZ2lzdGVyc1tleGl0LnZhcmlhYmxlRm9ySW5kZXgoaW5kZXgp XSkgewotICAgICAgICAgICAgICAgIHN0b3JlMzIoVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkludDMy VGFnKSwgcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oc2NyYXRjaEJ1ZmZlciArIHNjcmF0Y2hJbmRl eCkgKyBPQkpFQ1RfT0ZGU0VUT0YoRW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnRhZykp OwotICAgICAgICAgICAgICAgIHN0b3JlMzIocmVjb3ZlcnkuZ3ByKCksIHJlaW50ZXJwcmV0X2Nh c3Q8Y2hhcio+KHNjcmF0Y2hCdWZmZXIgKyBzY3JhdGNoSW5kZXgpICsgT0JKRUNUX09GRlNFVE9G KEVuY29kZWRWYWx1ZURlc2NyaXB0b3IsIGFzQml0cy5wYXlsb2FkKSk7Ci0gICAgICAgICAgICAg ICAgc2NyYXRjaEluZGV4Kys7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAg IHN0b3JlMzIoVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkludDMyVGFnKSwgdGFnRm9yKChWaXJ0dWFs UmVnaXN0ZXIpb3BlcmFuZCkpOwotICAgICAgICAgICAgICAgIHN0b3JlMzIocmVjb3ZlcnkuZ3By KCksIHBheWxvYWRGb3IoKFZpcnR1YWxSZWdpc3RlcilvcGVyYW5kKSk7Ci0gICAgICAgICAgICB9 Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBVbmJveGVkQm9vbGVhbkluR1BSOgot ICAgICAgICAgICAgaWYgKGV4aXQuaXNWYXJpYWJsZShpbmRleCkgJiYgcG9pc29uZWRWaXJ0dWFs UmVnaXN0ZXJzW2V4aXQudmFyaWFibGVGb3JJbmRleChpbmRleCldKSB7Ci0gICAgICAgICAgICAg ICAgc3RvcmUzMihUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6Qm9vbGVhblRhZyksIHJlaW50ZXJwcmV0 X2Nhc3Q8Y2hhcio+KHNjcmF0Y2hCdWZmZXIgKyBzY3JhdGNoSW5kZXgpICsgT0JKRUNUX09GRlNF VE9GKEVuY29kZWRWYWx1ZURlc2NyaXB0b3IsIGFzQml0cy50YWcpKTsKLSAgICAgICAgICAgICAg ICBzdG9yZTMyKHJlY292ZXJ5LmdwcigpLCByZWludGVycHJldF9jYXN0PGNoYXIqPihzY3JhdGNo QnVmZmVyICsgc2NyYXRjaEluZGV4KSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNj cmlwdG9yLCBhc0JpdHMucGF5bG9hZCkpOwotICAgICAgICAgICAgICAgIHNjcmF0Y2hJbmRleCsr OwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBzdG9yZTMyKFRydXN0ZWRJ bW0zMihKU1ZhbHVlOjpCb29sZWFuVGFnKSwgdGFnRm9yKChWaXJ0dWFsUmVnaXN0ZXIpb3BlcmFu ZCkpOworICAgICAgICAgICAgaWYgKGV4aXQuaXNWYXJpYWJsZShpbmRleCkgJiYgcG9pc29uZWRW aXJ0dWFsUmVnaXN0ZXJzW2V4aXQudmFyaWFibGVGb3JJbmRleChpbmRleCldKQorICAgICAgICAg ICAgICAgIHN0b3JlMzIocmVjb3ZlcnkuZ3ByKCksIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KHNj cmF0Y2hCdWZmZXIgKyBzY3JhdGNoSW5kZXgrKykgKyBPQkpFQ1RfT0ZGU0VUT0YoRW5jb2RlZFZh bHVlRGVzY3JpcHRvciwgYXNCaXRzLnBheWxvYWQpKTsKKyAgICAgICAgICAgIGVsc2UgeworICAg ICAgICAgICAgICAgIHVpbnQzMl90IHRhZyA9IEpTVmFsdWU6OkVtcHR5VmFsdWVUYWc7CisgICAg ICAgICAgICAgICAgaWYgKHJlY292ZXJ5LnRlY2huaXF1ZSgpID09IEluR1BSKQorICAgICAgICAg ICAgICAgICAgICB0YWcgPSBKU1ZhbHVlOjpDZWxsVGFnOworICAgICAgICAgICAgICAgIGVsc2Ug aWYgKHJlY292ZXJ5LnRlY2huaXF1ZSgpID09IFVuYm94ZWRJbnQzMkluR1BSKQorICAgICAgICAg ICAgICAgICAgICB0YWcgPSBKU1ZhbHVlOjpJbnQzMlRhZzsKKyAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgIHRhZyA9IEpTVmFsdWU6OkJvb2xlYW5UYWc7CisgICAgICAg ICAgICAgICAgc3RvcmUzMihUcnVzdGVkSW1tMzIodGFnKSwgdGFnRm9yKChWaXJ0dWFsUmVnaXN0 ZXIpb3BlcmFuZCkpOwogICAgICAgICAgICAgICAgIHN0b3JlMzIocmVjb3ZlcnkuZ3ByKCksIHBh eWxvYWRGb3IoKFZpcnR1YWxSZWdpc3RlcilvcGVyYW5kKSk7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICBicmVhazsKQEAgLTM4Niw3ICszNzMsMjAgQEAgdm9pZCBKSVRDb21waWxlcjo6ZXhp dFNwZWN1bGF0aXZlV2l0aE9TUgogICAgICAgICAgICAgc3dpdGNoIChyZWNvdmVyeS50ZWNobmlx dWUoKSkgewogICAgICAgICAgICAgY2FzZSBJbkdQUjoKICAgICAgICAgICAgIGNhc2UgVW5ib3hl ZEludDMySW5HUFI6Ci0gICAgICAgICAgICBjYXNlIFVuYm94ZWRCb29sZWFuSW5HUFI6CisgICAg ICAgICAgICBjYXNlIFVuYm94ZWRCb29sZWFuSW5HUFI6IHsKKyAgICAgICAgICAgICAgICBsb2Fk MzIocmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oc2NyYXRjaEJ1ZmZlciArIHNjcmF0Y2hJbmRleCsr KSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNjcmlwdG9yLCBhc0JpdHMucGF5bG9h ZCksIEdQUkluZm86OnJlZ1QwKTsKKyAgICAgICAgICAgICAgICBzdG9yZTMyKEdQUkluZm86OnJl Z1QwLCBwYXlsb2FkRm9yKChWaXJ0dWFsUmVnaXN0ZXIpdmlydHVhbFJlZ2lzdGVyKSk7CisgICAg ICAgICAgICAgICAgdWludDMyX3QgdGFnID0gSlNWYWx1ZTo6RW1wdHlWYWx1ZVRhZzsKKyAgICAg ICAgICAgICAgICBpZiAocmVjb3ZlcnkudGVjaG5pcXVlKCkgPT0gSW5HUFIpCisgICAgICAgICAg ICAgICAgICAgIHRhZyA9IEpTVmFsdWU6OkNlbGxUYWc7CisgICAgICAgICAgICAgICAgZWxzZSBp ZiAocmVjb3ZlcnkudGVjaG5pcXVlKCkgPT0gVW5ib3hlZEludDMySW5HUFIpCisgICAgICAgICAg ICAgICAgICAgIHRhZyA9IEpTVmFsdWU6OkludDMyVGFnOworICAgICAgICAgICAgICAgIGVsc2UK KyAgICAgICAgICAgICAgICAgICAgdGFnID0gSlNWYWx1ZTo6Qm9vbGVhblRhZzsKKyAgICAgICAg ICAgICAgICBzdG9yZTMyKFRydXN0ZWRJbW0zMih0YWcpLCB0YWdGb3IoKFZpcnR1YWxSZWdpc3Rl cil2aXJ0dWFsUmVnaXN0ZXIpKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg IH0KKwogICAgICAgICAgICAgY2FzZSBJbkZQUjoKICAgICAgICAgICAgIGNhc2UgSW5QYWlyOgog ICAgICAgICAgICAgICAgIGxvYWQzMihyZWludGVycHJldF9jYXN0PGNoYXIqPihzY3JhdGNoQnVm ZmVyICsgc2NyYXRjaEluZGV4KSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNjcmlw dG9yLCBhc0JpdHMucGF5bG9hZCksIEdQUkluZm86OnJlZ1QwKTsKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkocmV2 aXNpb24gOTkxMjYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZl SklUMzJfNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTUsOSArMjk1LDggQEAgR1BSUmVnIFNw ZWN1bGF0aXZlSklUOjpmaWxsU3BlY3VsYXRlQ2VsbAogICAgICAgICAgICAgcmV0dXJuIGdwcjsK ICAgICAgICAgfQogICAgICAgICBBU1NFUlQoaW5mby5zcGlsbEZvcm1hdCgpICYgRGF0YUZvcm1h dEpTKTsKLSAgICAgICAgbV9qaXQubG9hZDMyKEpJVENvbXBpbGVyOjp0YWdGb3IodmlydHVhbFJl Z2lzdGVyKSwgZ3ByKTsKICAgICAgICAgaWYgKGluZm8uc3BpbGxGb3JtYXQoKSAhPSBEYXRhRm9y bWF0SlNDZWxsKQotICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhKU1ZhbHVlU291cmNlKEpJ VENvbXBpbGVyOjphZGRyZXNzRm9yKHZpcnR1YWxSZWdpc3RlcikpLCBub2RlSW5kZXgsIG1faml0 LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpOb3RFcXVhbCwgZ3ByLCBUcnVzdGVkSW1tMzIoSlNW YWx1ZTo6Q2VsbFRhZykpKTsKKyAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soSlNWYWx1ZVNv dXJjZShKSVRDb21waWxlcjo6YWRkcmVzc0Zvcih2aXJ0dWFsUmVnaXN0ZXIpKSwgbm9kZUluZGV4 LCBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxlcjo6Tm90RXF1YWwsIEpJVENvbXBpbGVyOjp0 YWdGb3IodmlydHVhbFJlZ2lzdGVyKSwgVHJ1c3RlZEltbTMyKEpTVmFsdWU6OkNlbGxUYWcpKSk7 CiAgICAgICAgIG1faml0LmxvYWQzMihKSVRDb21waWxlcjo6cGF5bG9hZEZvcih2aXJ0dWFsUmVn aXN0ZXIpLCBncHIpOwogICAgICAgICBtX2dwcnMucmV0YWluKGdwciwgdmlydHVhbFJlZ2lzdGVy LCBTcGlsbE9yZGVyU3BpbGxlZCk7CiAgICAgICAgIGluZm8uZmlsbENlbGwoZ3ByKTsK