150657 2015-10-28 18:56:30 -0700 Air::spillEverything() should try to replace tmps with spill slots without using registers whenever possible 2015-10-30 03:01:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 150279 1 fpizlo fpizlo barraclough benjamin commit-queue ggaren mark.lam mhahnenb msaboff nrotem oliver ossy saam sam oldest_to_newest 1137418 0 fpizlo 2015-10-28 18:56:30 -0700 This is necessary for lowering patchpoints and stackmaps, where the number of operands may be greater than the number of registers, and we're happy to accept stack slots instead of registers. 1137447 1 264298 fpizlo 2015-10-28 21:48:52 -0700 Created attachment 264298 the patch 1137448 2 commit-queue 2015-10-28 21:50:06 -0700 Attachment 264298 did not pass style-queue: ERROR: Source/JavaScriptCore/b3/air/AirSpillEverything.cpp:103: Multi line control clauses should use braces. [whitespace/braces] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1137600 3 264298 ggaren 2015-10-29 11:58:58 -0700 Comment on attachment 264298 the patch r=me 1137601 4 fpizlo 2015-10-29 12:02:27 -0700 Landed in http://trac.webkit.org/changeset/191742 1137613 5 ossy 2015-10-29 12:43:14 -0700 (In reply to comment #4) > Landed in http://trac.webkit.org/changeset/191742 It broke the iOS build. 1137687 6 fpizlo 2015-10-29 15:40:48 -0700 (In reply to comment #5) > (In reply to comment #4) > > Landed in http://trac.webkit.org/changeset/191742 > > It broke the iOS build. I fixed it. 1137843 7 ossy 2015-10-30 03:01:53 -0700 (In reply to comment #6) > (In reply to comment #5) > > (In reply to comment #4) > > > Landed in http://trac.webkit.org/changeset/191742 > > > > It broke the iOS build. > > I fixed it. ... in https://trac.webkit.org/changeset/191750 Thanks for the fix. 264298 2015-10-28 21:48:52 -0700 2015-10-29 11:58:58 -0700 the patch blah.patch text/plain 8805 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkxNzE5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE1LTEwLTI4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg QWlyOjpzcGlsbEV2ZXJ5dGhpbmcoKSBzaG91bGQgdHJ5IHRvIHJlcGxhY2UgdG1wcyB3aXRoIHNw aWxsIHNsb3RzIHdpdGhvdXQgdXNpbmcgcmVnaXN0ZXJzIHdoZW5ldmVyIHBvc3NpYmxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA2NTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHNvIGFkZGVkIHRo ZSBhYmlsaXR5IHRvIHN0b3JlIGFuIGltbWVkaWF0ZSB0byBtZW1vcnkuCisKKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXI6 OnN0b3JlUHRyKToKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJBUk02NC5oOgor ICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlckFSTTY0OjpzdG9yZTY0KToKKyAgICAgICAgKiBh c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZfNjQuaDoKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3Nl bWJsZXJYODZfNjQ6OnN0b3JlNjQpOgorICAgICAgICAqIGIzL0IzTG93ZXJUb0Fpci5jcHA6Cisg ICAgICAgIChKU0M6OkIzOjpBaXI6Okxvd2VyVG9BaXI6OmltbSk6CisgICAgICAgIChKU0M6OkIz OjpBaXI6Okxvd2VyVG9BaXI6OmltbUFueUludCk6CisgICAgICAgIChKU0M6OkIzOjpBaXI6Okxv d2VyVG9BaXI6OmltbU9yVG1wKToKKyAgICAgICAgKEpTQzo6QjM6OkFpcjo6TG93ZXJUb0Fpcjo6 dHJ5U3RvcmUpOgorICAgICAgICAqIGIzL2Fpci9BaXJPcGNvZGUub3Bjb2RlczoKKyAgICAgICAg KiBiMy9haXIvQWlyU3BpbGxFdmVyeXRoaW5nLmNwcDoKKyAgICAgICAgKEpTQzo6QjM6OkFpcjo6 c3BpbGxFdmVyeXRoaW5nKToKKyAgICAgICAgKiBiMy90ZXN0YjMuY3BwOgorICAgICAgICAoSlND OjpCMzo6dGVzdFN0b3JlKToKKyAgICAgICAgKEpTQzo6QjM6OnRlc3RTdG9yZUNvbnN0YW50KToK KyAgICAgICAgKEpTQzo6QjM6OnRlc3RTdG9yZUNvbnN0YW50UHRyKToKKyAgICAgICAgKEpTQzo6 QjM6OnRlc3RUcnVuYyk6CisgICAgICAgIChKU0M6OkIzOjpydW4pOgorCiAyMDE1LTEwLTI4ICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVuYW1lIEluc3BlY3RvclJlc291cmNlQWdlbnQgdG8gSW5zcGVjdG9yTmV0d29ya0Fn ZW50CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fz c2VtYmxlci5oCShyZXZpc2lvbiAxOTE3MTgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNz ZW1ibGVyL01hY3JvQXNzZW1ibGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTg4MCw2ICs4ODAsMTEg QEAgcHVibGljOgogICAgICAgICBzdG9yZTY0KFRydXN0ZWRJbW02NChpbW0pLCBhZGRyZXNzKTsK ICAgICB9CiAKKyAgICB2b2lkIHN0b3JlUHRyKFRydXN0ZWRJbW0zMiBpbW0sIEltcGxpY2l0QWRk cmVzcyBhZGRyZXNzKQorICAgIHsKKyAgICAgICAgc3RvcmU2NChpbW0sIGFkZHJlc3MpOworICAg IH0KKwogICAgIHZvaWQgc3RvcmVQdHIoVHJ1c3RlZEltbVB0ciBpbW0sIEJhc2VJbmRleCBhZGRy ZXNzKQogICAgIHsKICAgICAgICAgc3RvcmU2NChUcnVzdGVkSW1tNjQoaW1tKSwgYWRkcmVzcyk7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQVJN NjQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3Jv QXNzZW1ibGVyQVJNNjQuaAkocmV2aXNpb24gMTkxNzE4KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckFSTTY0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEw MDAsNiArMTAwMCwxMSBAQCBwdWJsaWM6CiAgICAgICAgIHN0b3JlPDY0PihzcmMsIGFkZHJlc3Mp OwogICAgIH0KIAorICAgIHZvaWQgc3RvcmU2NChUcnVzdGVkSW1tMzIgaW1tLCBJbXBsaWNpdEFk ZHJlc3MgYWRkcmVzcykKKyAgICB7CisgICAgICAgIHN0b3JlNjQoVHJ1c3RlZEltbTY0KGltbSks IGFkZHJlc3MpOworICAgIH0KKwogICAgIHZvaWQgc3RvcmU2NChUcnVzdGVkSW1tNjQgaW1tLCBJ bXBsaWNpdEFkZHJlc3MgYWRkcmVzcykKICAgICB7CiAgICAgICAgIGlmICghaW1tLm1fdmFsdWUp IHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJY ODZfNjQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyWDg2XzY0LmgJKHJldmlzaW9uIDE5MTcxOCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJYODZfNjQuaAkod29ya2luZyBjb3B5KQpA QCAtNDgwLDE0ICs0ODAsMjAgQEAgcHVibGljOgogICAgICAgICB9CiAgICAgfQogCisgICAgdm9p ZCBzdG9yZTY0KFRydXN0ZWRJbW0zMiBpbW0sIEltcGxpY2l0QWRkcmVzcyBhZGRyZXNzKQorICAg IHsKKyAgICAgICAgbV9hc3NlbWJsZXIubW92cV9pMzJtKGltbS5tX3ZhbHVlLCBhZGRyZXNzLm9m ZnNldCwgYWRkcmVzcy5iYXNlKTsKKyAgICB9CisKICAgICB2b2lkIHN0b3JlNjQoVHJ1c3RlZElt bTY0IGltbSwgSW1wbGljaXRBZGRyZXNzIGFkZHJlc3MpCiAgICAgewotICAgICAgICBpZiAoQ0FO X1NJR05fRVhURU5EXzMyXzY0KGltbS5tX3ZhbHVlKSkKLSAgICAgICAgICAgIG1fYXNzZW1ibGVy Lm1vdnFfaTMybShzdGF0aWNfY2FzdDxpbnQ+KGltbS5tX3ZhbHVlKSwgYWRkcmVzcy5vZmZzZXQs IGFkZHJlc3MuYmFzZSk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgbW92ZShpbW0sIHNj cmF0Y2hSZWdpc3Rlcik7Ci0gICAgICAgICAgICBzdG9yZTY0KHNjcmF0Y2hSZWdpc3RlciwgYWRk cmVzcyk7CisgICAgICAgIGlmIChDQU5fU0lHTl9FWFRFTkRfMzJfNjQoaW1tLm1fdmFsdWUpKSB7 CisgICAgICAgICAgICBzdG9yZTY0KFRydXN0ZWRJbW0zMihzdGF0aWNfY2FzdDxpbnQzMl90Pihp bW0ubV92YWx1ZSkpLCBhZGRyZXNzKTsKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQor CisgICAgICAgIG1vdmUoaW1tLCBzY3JhdGNoUmVnaXN0ZXIpOworICAgICAgICBzdG9yZTY0KHNj cmF0Y2hSZWdpc3RlciwgYWRkcmVzcyk7CiAgICAgfQogCiAgICAgdm9pZCBzdG9yZTY0KFRydXN0 ZWRJbW02NCBpbW0sIEJhc2VJbmRleCBhZGRyZXNzKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2IzL0IzTG93ZXJUb0Fpci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2IzL0IzTG93ZXJUb0Fpci5jcHAJKHJldmlzaW9uIDE5MTcxOCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9iMy9CM0xvd2VyVG9BaXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODcsNiAr MTg3LDE3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIEFyZygpOwogICAgIH0KIAorICAgIEFy ZyBpbW1BbnlJbnQoVmFsdWUqIHZhbHVlKQorICAgIHsKKyAgICAgICAgaWYgKHZhbHVlLT5oYXNJ bnQoKSkgeworICAgICAgICAgICAgaW50NjRfdCBmdWxsVmFsdWUgPSB2YWx1ZS0+YXNJbnQoKTsK KyAgICAgICAgICAgIGludDMyX3QgaW1tZWRpYXRlVmFsdWUgPSBzdGF0aWNfY2FzdDxpbnQzMl90 PihmdWxsVmFsdWUpOworICAgICAgICAgICAgaWYgKGZ1bGxWYWx1ZSA9PSBpbW1lZGlhdGVWYWx1 ZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gQXJnOjppbW0oaW1tZWRpYXRlVmFsdWUpOworICAg ICAgICB9CisgICAgICAgIHJldHVybiBBcmcoKTsKKyAgICB9CisKICAgICBBcmcgaW1tT3JUbXAo VmFsdWUqIHZhbHVlKQogICAgIHsKICAgICAgICAgaWYgKEFyZyByZXN1bHQgPSBpbW0odmFsdWUp KQpAQCAtNTQxLDYgKzU1MiwxNSBAQCBwdWJsaWM6CiAgICAgCiAgICAgYm9vbCB0cnlTdG9yZShW YWx1ZSogdmFsdWUsIFZhbHVlKiBhZGRyZXNzKQogICAgIHsKKyAgICAgICAgQWlyOjpPcGNvZGUg bW92ZSA9IG1vdmVGb3JUeXBlKHZhbHVlLT50eXBlKCkpOworICAgICAgICBBcmcgZGVzdGluYXRp b24gPSBlZmZlY3RpdmVBZGRyKGFkZHJlc3MpOworCisgICAgICAgIEFyZyBpbW0gPSBpbW1BbnlJ bnQodmFsdWUpOworICAgICAgICBpZiAoaW1tICYmIGlzVmFsaWRGb3JtKG1vdmUsIEFyZzo6SW1t LCBkZXN0aW5hdGlvbi5raW5kKCkpKSB7CisgICAgICAgICAgICBhcHBlbmQobW92ZUZvclR5cGUo dmFsdWUtPnR5cGUoKSksIGltbSwgZWZmZWN0aXZlQWRkcihhZGRyZXNzLCBjdXJyZW50VmFsdWUp KTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgIAogICAgICAg ICBhcHBlbmQobW92ZUZvclR5cGUodmFsdWUtPnR5cGUoKSksIHRtcCh2YWx1ZSksIGVmZmVjdGl2 ZUFkZHIoYWRkcmVzcywgY3VycmVudFZhbHVlKSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy90ZXN0YjMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy90ZXN0YjMuY3BwCShyZXZpc2lvbiAxOTE3MTgp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvdGVzdGIzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTQ4LDYgKzE0OCw0MiBAQCB2b2lkIHRlc3RTdG9yZShpbnQgdmFsdWUpCiAgICAgQ0hFQ0so c2xvdCA9PSB2YWx1ZSk7CiB9CiAKK3ZvaWQgdGVzdFN0b3JlQ29uc3RhbnQoaW50IHZhbHVlKQor eworICAgIFByb2NlZHVyZSBwcm9jOworICAgIEJhc2ljQmxvY2sqIHJvb3QgPSBwcm9jLmFkZEJs b2NrKCk7CisgICAgaW50IHNsb3QgPSAweGJhYWRiZWVmOworICAgIHJvb3QtPmFwcGVuZE5ldzxN ZW1vcnlWYWx1ZT4oCisgICAgICAgIHByb2MsIFN0b3JlLCBPcmlnaW4oKSwKKyAgICAgICAgcm9v dC0+YXBwZW5kTmV3PENvbnN0MzJWYWx1ZT4ocHJvYywgT3JpZ2luKCksIHZhbHVlKSwKKyAgICAg ICAgcm9vdC0+YXBwZW5kTmV3PENvbnN0UHRyVmFsdWU+KHByb2MsIE9yaWdpbigpLCAmc2xvdCkp OworICAgIHJvb3QtPmFwcGVuZE5ldzxDb250cm9sVmFsdWU+KAorICAgICAgICBwcm9jLCBSZXR1 cm4sIE9yaWdpbigpLCByb290LT5hcHBlbmROZXc8Q29uc3QzMlZhbHVlPihwcm9jLCBPcmlnaW4o KSwgMCkpOworCisgICAgQ0hFQ0soIWNvbXBpbGVBbmRSdW48aW50Pihwcm9jKSk7CisgICAgQ0hF Q0soc2xvdCA9PSB2YWx1ZSk7Cit9CisKK3ZvaWQgdGVzdFN0b3JlQ29uc3RhbnRQdHIoaW50cHRy X3QgdmFsdWUpCit7CisgICAgUHJvY2VkdXJlIHByb2M7CisgICAgQmFzaWNCbG9jayogcm9vdCA9 IHByb2MuYWRkQmxvY2soKTsKKyAgICBpbnRwdHJfdCBzbG90OworICAgIGlmIChpczY0Qml0KCkp CisgICAgICAgIHNsb3QgPSAoc3RhdGljX2Nhc3Q8aW50cHRyX3Q+KDB4YmFhZGJlZWYpIDw8IDMy KSArIHN0YXRpY19jYXN0PGludHB0cl90PigweGJhYWRiZWVmKTsKKyAgICBlbHNlCisgICAgICAg IHNsb3QgPSAweGJhYWRiZWVmOworICAgIHJvb3QtPmFwcGVuZE5ldzxNZW1vcnlWYWx1ZT4oCisg ICAgICAgIHByb2MsIFN0b3JlLCBPcmlnaW4oKSwKKyAgICAgICAgcm9vdC0+YXBwZW5kTmV3PENv bnN0UHRyVmFsdWU+KHByb2MsIE9yaWdpbigpLCB2YWx1ZSksCisgICAgICAgIHJvb3QtPmFwcGVu ZE5ldzxDb25zdFB0clZhbHVlPihwcm9jLCBPcmlnaW4oKSwgJnNsb3QpKTsKKyAgICByb290LT5h cHBlbmROZXc8Q29udHJvbFZhbHVlPigKKyAgICAgICAgcHJvYywgUmV0dXJuLCBPcmlnaW4oKSwg cm9vdC0+YXBwZW5kTmV3PENvbnN0MzJWYWx1ZT4ocHJvYywgT3JpZ2luKCksIDApKTsKKworICAg IENIRUNLKCFjb21waWxlQW5kUnVuPGludD4ocHJvYykpOworICAgIENIRUNLKHNsb3QgPT0gdmFs dWUpOworfQorCiB2b2lkIHRlc3RUcnVuYyhpbnQ2NF90IHZhbHVlKQogewogICAgIFByb2NlZHVy ZSBwcm9jOwpAQCAtMzM3LDYgKzM3Myw4IEBAIHZvaWQgcnVuKCkKICAgICBSVU4odGVzdEFkZEFy Z3MzMigxLCAxKSk7CiAgICAgUlVOKHRlc3RBZGRBcmdzMzIoMSwgMikpOwogICAgIFJVTih0ZXN0 U3RvcmUoNDQpKTsKKyAgICBSVU4odGVzdFN0b3JlQ29uc3RhbnQoNDkpKTsKKyAgICBSVU4odGVz dFN0b3JlQ29uc3RhbnRQdHIoNDkpKTsKICAgICBSVU4odGVzdFRydW5jKChzdGF0aWNfY2FzdDxp bnQ2NF90PigxKSA8PCA0MCkgKyA0MikpOwogICAgIFJVTih0ZXN0QWRkMSg0NSkpOwogICAgIFJV Tih0ZXN0U3RvcmVBZGRMb2FkKDQ2KSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMv YWlyL0Fpck9wY29kZS5vcGNvZGVzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9iMy9haXIvQWlyT3Bjb2RlLm9wY29kZXMJKHJldmlzaW9uIDE5MTcxOCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyT3Bjb2RlLm9wY29kZXMJKHdvcmtpbmcgY29weSkKQEAg LTEwOCw2ICsxMDgsNyBAQCBNb3ZlIFU6RywgRDpHCiAgICAgSW5kZXgsIFRtcCBhcyBsb2FkUHRy CiAgICAgVG1wLCBBZGRyIGFzIHN0b3JlUHRyCiAgICAgVG1wLCBJbmRleCBhcyBzdG9yZVB0cgor ICAgIEltbSwgQWRkciBhcyBzdG9yZVB0cgogCiBNb3ZlMzIgVTpHLCBEOkcKICAgICBUbXAsIFRt cCBhcyB6ZXJvRXh0ZW5kMzJUb1B0cgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fp ci9BaXJTcGlsbEV2ZXJ5dGhpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9iMy9haXIvQWlyU3BpbGxFdmVyeXRoaW5nLmNwcAkocmV2aXNpb24gMTkxNzE4KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJTcGlsbEV2ZXJ5dGhpbmcuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05MSwxMSArOTEsMjkgQEAgdm9pZCBzcGlsbEV2ZXJ5dGhpbmcoQ29kZSYg Y29kZSkKICAgICAgICAgICAgIFJlZ2lzdGVyU2V0JiBzZXRCZWZvcmUgPSB1c2VkUmVnaXN0ZXJz W2Jsb2NrXVtpbnN0SW5kZXhdOwogICAgICAgICAgICAgUmVnaXN0ZXJTZXQmIHNldEFmdGVyID0g dXNlZFJlZ2lzdGVyc1tibG9ja11baW5zdEluZGV4ICsgMV07CiAgICAgICAgICAgICBJbnN0JiBp bnN0ID0gYmxvY2stPmF0KGluc3RJbmRleCk7CisKKyAgICAgICAgICAgIC8vIEZpcnN0IHRyeSB0 byBzcGlsbCBkaXJlY3RseS4KKyAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBp bnN0LmFyZ3Muc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgICAgICAgICBBcmcmIGFyZyA9IGluc3Qu YXJnc1tpXTsKKworICAgICAgICAgICAgICAgIGlmIChhcmcuaXNUbXAoKSkgeworICAgICAgICAg ICAgICAgICAgICBpZiAoYXJnLmlzUmVnKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKKworICAgICAgICAgICAgICAgICAgICBpZiAoaW5zdC5hZG1pdHNTdGFjayhpKSkgeyAK KyAgICAgICAgICAgICAgICAgICAgICAgIFN0YWNrU2xvdCogc3RhY2tTbG90ID0gYWxsU3RhY2tT bG90c1thcmcudHlwZSgpXVthcmcudG1wSW5kZXgoKV07CisgICAgICAgICAgICAgICAgICAgICAg ICBhcmcgPSBBcmc6OnN0YWNrKHN0YWNrU2xvdCk7CisgICAgICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgLy8gTm93IGZhbGwgYmFjayBvbiBzcGlsbGluZyB1c2lu ZyBzZXBhcmF0ZSBNb3ZlJ3MgdG8gbG9hZC9zdG9yZSB0aGUgdG1wLgogICAgICAgICAgICAgaW5z dC5mb3JFYWNoVG1wKAogICAgICAgICAgICAgICAgIFsmXSAoVG1wJiB0bXAsIEFyZzo6Um9sZSBy b2xlLCBBcmc6OlR5cGUgdHlwZSkgewogICAgICAgICAgICAgICAgICAgICBpZiAodG1wLmlzUmVn KCkpCiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0KKyAgICAgICAgICAgICAgICAg ICAgCiAgICAgICAgICAgICAgICAgICAgIFN0YWNrU2xvdCogc3RhY2tTbG90ID0gYWxsU3RhY2tT bG90c1t0eXBlXVt0bXAudG1wSW5kZXgoKV07CiAgICAgICAgICAgICAgICAgICAgIEFyZyBhcmcg PSBBcmc6OnN0YWNrKHN0YWNrU2xvdCk7CiAK