218073 2020-10-22 02:21:00 -0700 DFGIntegerRangeOptimization is wrong for Upsilon (as 'shadow' nodes are not in SSA form) 2020-10-28 10:33:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rmorisset rmorisset ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1700581 0 rmorisset 2020-10-22 02:21:00 -0700 rdar://problem/69823539 1700582 1 412078 rmorisset 2020-10-22 02:30:10 -0700 Created attachment 412078 Patch 1700586 2 412079 rmorisset 2020-10-22 02:38:00 -0700 Created attachment 412079 Patch fix trivial style nit 1702346 3 412079 saam 2020-10-28 09:48:21 -0700 Comment on attachment 412079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412079&action=review > Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp:1532 > + unsigned i = 0, j = 0; Nit: should be two lines def 1702363 4 ews-feeder 2020-10-28 10:32:32 -0700 Committed r269107: <https://trac.webkit.org/changeset/269107> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412079. 1702364 5 webkit-bug-importer 2020-10-28 10:33:20 -0700 <rdar://problem/70769919> 412078 2020-10-22 02:30:10 -0700 2020-10-22 02:38:00 -0700 Patch patch text/plain 5887 rmorisset ZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NmNhZGI1NTM2MzMyLi41ZTNjMzRmYzYxZmYgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9n CisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMjIgIFJv YmluIE1vcmlzc2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNvbT4KKworICAgICAgICBERkdJbnRlZ2Vy UmFuZ2VPcHRpbWl6YXRpb24gaXMgd3JvbmcgZm9yIFVwc2lsb24gKGFzICdzaGFkb3cnIG5vZGVz IGFyZSBub3QgaW4gU1NBIGZvcm0pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTgwNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgb25seSB0ZXN0Y2FzZSBJIG1hbmFnZWQgdG8gZ2V0IGZvciB0aGlz IGJ1ZyBsb29wcyBmb3JldmVyIHdoZW4gbm90IGNyYXNoaW5nLgorICAgICAgICBTbyBJIHVzZSBh IDFzIHRpbWVvdXQgdGhyb3VnaCAtLXdhdGNoZG9nPTEwMDAuCisKKyAgICAgICAgKiBzdHJlc3Mv Ym91bmRzLWNoZWNraW5nLWluLWNvbGQtbG9vcC5qczogQWRkZWQuCisgICAgICAgICh0cnVlLnZt LmZ0bFRydWUpOgorCiAyMDIwLTEwLTIxICBDYWl0bGluIFBvdHRlciAgPGNhaXRwQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0pTQ10gc3VwcG9ydCBvcF9nZXRfcHJpdmF0ZV9uYW1lIGluIERGRyBh bmQgRlRMCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9ib3VuZHMtY2hlY2tpbmctaW4tY29s ZC1sb29wLmpzIGIvSlNUZXN0cy9zdHJlc3MvYm91bmRzLWNoZWNraW5nLWluLWNvbGQtbG9vcC5q cwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjI5YjNiMGZhNjA0Mwot LS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL2JvdW5kcy1jaGVja2luZy1pbi1jb2xk LWxvb3AuanMKQEAgLTAsMCArMSwxMiBAQAorLy9AIHJ1bkZUTEVhZ2VyKCItLXdhdGNoZG9nPTEw MDAiLCAiLS13YXRjaGRvZy1leGNlcHRpb24tb2siKQorbGV0IGEgPSBbXTsKK2FbMF0gPSB1bmRl ZmluZWQ7CisKK3doaWxlICh0cnVlKSB7CisgIGxldCBpID0gMDsKKyAgYVswXTsKKyAgd2hpbGUg KCR2bS5mdGxUcnVlKCkpIHsKKyAgICBhW2krK10gPSB1bmRlZmluZWQ7CisgIH0KK30KKwpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggMmU4ZWEyNjQzYWMwLi4xMjVhM2EzYTgxODAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTIyICBSb2JpbiBN b3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5jb20+CisKKyAgICAgICAgREZHSW50ZWdlclJhbmdl T3B0aW1pemF0aW9uIGlzIHdyb25nIGZvciBVcHNpbG9uIChhcyAnc2hhZG93JyBub2RlcyBhcmUg bm90IGluIFNTQSBmb3JtKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE4MDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW4gREZHSW50ZWdlclJhbmdlT3B0aW1pemF0aW9uLCB3aGVuIHZpc2l0aW5nIGFu IFVwc2lsb24gbm9kZSwgd2UgY2FsbCBzZXRFcXVpdmFsZW5jZSwgdGhhdCBjYWxscyBzZXRSZWxh dGlvbnNoaXAuCisgICAgICAgIEJ1dCBkZXNwaXRlIGl0cyBuYW1lLCB0aGlzIGZ1bmN0aW9uIGRv ZXMgbm90IG92ZXJ3cml0ZSBhIHByZS1leGlzdGluZyByZWxhdGlvbnNoaXAsIGl0IHNpbXBseSBy ZXBsYWNlcyBpdCBieSBhbiBvdmVyLWFwcHJveGltYXRpb24gb2YgdGhlIGludGVyc2VjdGlvbiBv ZiB0aGUgb2xkIGFuZCBuZXcgcmVsYXRpb25zaGlwIChzZWUgdGhlIGZpbHRlciBtZXRob2QpLgor ICAgICAgICBTaW5jZSB0aGUgb2xkIHJlbGF0aW9uc2hpcCBpcyBhbHdheXMgKGJ5IGRlZmluaXRp b24pIGFuIG92ZXItYXBwcm94aW1hdGlvbiBvZiB0aGlzIGludGVyc2VjdGlvbiwgaXQgd2lsbCBv ZnRlbiBkbyBub3RoaW5nIGF0IGFsbCBpZiBpdCBjYW5ub3QgZmluZCBhIGNsb3NlciBhcHByb3hp bWF0aW9uLgorICAgICAgICBUaGlzIGlzIGEgcHJvYmxlbSBzcGVjaWZpY2FsbHkgZm9yIFVwc2ls b24gbm9kZXMsIGJlY2F1c2Ugc2V2ZXJhbCBvZiB0aGVtIGNhbiBzdG9yZSB0byB0aGUgc2FtZSAi c2hhZG93IG5vZGUiIGNvcnJlc3BvbmRpbmcgdG8gYSBnaXZlbiBQaGksIHNvIHRoZXkgYXJlIHRo ZSBvbmx5IGNhc2Ugd2hlcmUgdGhlcmUgY2FuIGFscmVhZHkgYmUgYSBjb21wbGV0ZWx5IGRpZmZl cmVudCByZWxhdGlvbnNoaXAgZm9yIHRoZSBzYW1lIG5vZGVzIChjb21pbmcgZnJvbSBhIGRpZmZl cmVudCBVcHNpbG9uKS4KKworICAgICAgICBUaGUgZml4IGlzIHZlcnkgc2ltcGxlIHRoYW5rcyB0 byBhIHN1Z2dlc3Rpb24gYnkgUGhpbDogd2UganVzdCByZW1vdmUgYWxsIHJlbGF0aW9uc2hpcHMg cmVmZXJyaW5nIHRvIHRoZSBzaGFkb3cgbm9kZSBqdXN0IGJlZm9yZSBleGVjdXRpbmcgYW4gVXBz aWxvbi4KKyAgICAgICAgVGhpcyBpcyBjb3JyZWN0IHNpbmNlIHRoZSB1cHNpbG9uIGVmZmVjdGl2 ZWx5IGtpbGxzIHRoYXQgc2hhZG93IG5vZGUsIGJlZm9yZSBtYWtpbmcgaXQgbGl2ZSBhZ2FpbiB3 aXRoIGEgZGlmZmVyZW50IHZhbHVlLCBhbmQgd2UgYWxyZWFkeSBhZ2dyZXNzaXZlbHkgcHJ1bmUg dGhlIHJlbGF0aW9uc2hpcE1hcHMgYnkgbGl2ZW5lc3MuCisKKyAgICAgICAgKiBkZmcvREZHSW50 ZWdlclJhbmdlT3B0aW1pemF0aW9uUGhhc2UuY3BwOgorCiAyMDIwLTEwLTIxICBDYWl0bGluIFBv dHRlciAgPGNhaXRwQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0pTQ10gc3VwcG9ydCBvcF9nZXRf cHJpdmF0ZV9uYW1lIGluIERGRyBhbmQgRlRMCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0ludGVnZXJSYW5nZU9wdGltaXphdGlvblBoYXNlLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHSW50ZWdlclJhbmdlT3B0aW1pemF0aW9uUGhhc2UuY3BwCmlu ZGV4IGQxNDIyMjU0ZWZmYi4uODJhNDdmZDM2NDRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0ludGVnZXJSYW5nZU9wdGltaXphdGlvblBoYXNlLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ludGVnZXJSYW5nZU9wdGltaXphdGlvblBoYXNl LmNwcApAQCAtMTUwMyw5ICsxNTAzLDEyIEBAIHByaXZhdGU6CiAgICAgICAgIH0KICAgICAgICAg ICAgIAogICAgICAgICBjYXNlIFVwc2lsb246IHsKLSAgICAgICAgICAgIHNldEVxdWl2YWxlbmNl KAotICAgICAgICAgICAgICAgIG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwKLSAgICAgICAgICAgICAg ICBOb2RlRmxvd1Byb2plY3Rpb24obm9kZS0+cGhpKCksIE5vZGVGbG93UHJvamVjdGlvbjo6U2hh ZG93KSk7CisgICAgICAgICAgICBhdXRvIHNoYWRvd05vZGUgPSBOb2RlRmxvd1Byb2plY3Rpb24o bm9kZS0+cGhpKCksIE5vZGVGbG93UHJvamVjdGlvbjo6U2hhZG93KTsKKyAgICAgICAgICAgIC8v IFdlIG11c3QgZmlyc3QgcmVtb3ZlIGFsbCByZWxhdGlvbnNoaXBzIGludm9sdmluZyB0aGUgc2hh ZG93IG5vZGUsIGJlY2F1c2Ugc2V0RXF1aXZhbGVuY2UgZG9lcyBub3Qgb3ZlcndyaXRlIHRoZW0u CisgICAgICAgICAgICAvLyBPdmVyd3JpdGluZyBpcyBvbmx5IHJlcXVpcmVkIGhlcmUgYmVjYXVz ZSB0aGUgc2hhZG93Tm9kZXMgYXJlIG5vdCBpbiBTU0EgZm9ybSAoY2FuIGJlIHdyaXR0ZW4gdG8g Ynkgc2V2ZXJhbCBVcHNpbG9ucykuCisgICAgICAgICAgICAvLyBBbm90aGVyIHdheSB0byB0aGlu ayBvZiBpdCwgaXMgdGhhdCB3ZSBhcmUgbWFpbnRhaW5pbmcgdGhlIGludmFyaWFudCB0aGF0IHJl bGF0aW9uc2hpcE1hcHMgYXJlIHBydW5lZCBieSBsaXZlbmVzcy4KKyAgICAgICAgICAgIGtpbGwo c2hhZG93Tm9kZSk7CisgICAgICAgICAgICBzZXRFcXVpdmFsZW5jZShub2RlLT5jaGlsZDEoKS5u b2RlKCksIHNoYWRvd05vZGUpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAg ICAgICAgIApAQCAtMTUyMCw2ICsxNTIzLDIyIEBAIHByaXZhdGU6CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgfQogICAgIH0KKworICAgIHZvaWQga2lsbChOb2RlRmxvd1Byb2plY3Rpb24g bm9kZSkKKyAgICB7CisgICAgICAgIG1fcmVsYXRpb25zaGlwcy5yZW1vdmUobm9kZSk7CisKKyAg ICAgICAgZm9yKGF1dG8mIHJlbGF0aW9uc2hpcHMgOiBtX3JlbGF0aW9uc2hpcHMudmFsdWVzKCkp IHsKKyAgICAgICAgICAgIHVuc2lnbmVkIGkgPSAwLCBqID0gMDsKKyAgICAgICAgICAgIHdoaWxl IChpIDwgcmVsYXRpb25zaGlwcy5zaXplKCkpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBSZWxh dGlvbnNoaXAmIHJlbCA9IHJlbGF0aW9uc2hpcHNbaSsrXTsKKyAgICAgICAgICAgICAgICBBU1NF UlQocmVsLmxlZnQoKSAhPSBub2RlKTsKKyAgICAgICAgICAgICAgICBpZiAocmVsLnJpZ2h0KCkg IT0gbm9kZSkKKyAgICAgICAgICAgICAgICAgICAgcmVsYXRpb25zaGlwc1tqKytdID0gcmVsOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgcmVsYXRpb25zaGlwcy5zaHJpbmsoaik7CisgICAg ICAgIH0KKyAgICB9CiAgICAgCiAgICAgdm9pZCBzZXRFcXVpdmFsZW5jZShOb2RlRmxvd1Byb2pl Y3Rpb24gb2xkTm9kZSwgTm9kZUZsb3dQcm9qZWN0aW9uIG5ld05vZGUpCiAgICAgewpAQCAtMTU2 MCw3ICsxNTc5LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgCiAg ICAgICAgIGlmIChERkdJbnRlZ2VyUmFuZ2VPcHRpbWl6YXRpb25QaGFzZUludGVybmFsOjp2ZXJi b3NlKQotICAgICAgICAgICAgZGF0YUxvZygiICAgIFNldHRpbmc6ICIsIHJlbGF0aW9uc2hpcCwg IiAodHRsID0gIiwgdGltZVRvTGl2ZSwgIilcbiIpOworICAgICAgICAgICAgZGF0YUxvZ0xuKCIg ICAgU2V0dGluZzogIiwgcmVsYXRpb25zaGlwLCAiICh0dGwgPSAiLCB0aW1lVG9MaXZlLCAiKSIp OwogCiAgICAgICAgIGF1dG8gcmVzdWx0ID0gcmVsYXRpb25zaGlwTWFwLmFkZCgKICAgICAgICAg ICAgIHJlbGF0aW9uc2hpcC5sZWZ0KCksIFZlY3RvcjxSZWxhdGlvbnNoaXA+KCkpOwpAQCAtMTY0 Miw2ICsxNjYxLDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBpZiAoUmVsYXRpb25zaGlw IGZpbHRlcmVkID0gb3RoZXJSZWxhdGlvbnNoaXAuZmlsdGVyKHJlbGF0aW9uc2hpcCkpIHsKICAg ICAgICAgICAgICAgICAgICAgQVNTRVJUKGZpbHRlcmVkLmxlZnQoKSA9PSByZWxhdGlvbnNoaXAu bGVmdCgpKTsKICAgICAgICAgICAgICAgICAgICAgb3RoZXJSZWxhdGlvbnNoaXAgPSBmaWx0ZXJl ZDsKKyAgICAgICAgICAgICAgICAgICAgaWYgKERGR0ludGVnZXJSYW5nZU9wdGltaXphdGlvblBo YXNlSW50ZXJuYWw6OnZlcmJvc2UpCisgICAgICAgICAgICAgICAgICAgICAgICBkYXRhTG9nTG4o IiAgICAgIGZpbHRlcmVkOiAiLCBmaWx0ZXJlZCk7CiAgICAgICAgICAgICAgICAgICAgIGZvdW5k ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CkBAIC0xNjk5LDcgKzE3 MjAsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICB0b0FkZC5hcHBlbmQobmV3UmVs YXRpb25zaGlwKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICAKKwogICAgICAg ICBpZiAoIWZvdW5kKQogICAgICAgICAgICAgcmVsYXRpb25zaGlwcy5hcHBlbmQocmVsYXRpb25z aGlwKTsKICAgICAgICAgCg== 412079 2020-10-22 02:38:00 -0700 2020-10-28 10:32:32 -0700 Patch patch text/plain 5888 rmorisset ZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NmNhZGI1NTM2MzMyLi41ZTNjMzRmYzYxZmYgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9n CisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMTAtMjIgIFJv YmluIE1vcmlzc2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNvbT4KKworICAgICAgICBERkdJbnRlZ2Vy UmFuZ2VPcHRpbWl6YXRpb24gaXMgd3JvbmcgZm9yIFVwc2lsb24gKGFzICdzaGFkb3cnIG5vZGVz IGFyZSBub3QgaW4gU1NBIGZvcm0pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTgwNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgb25seSB0ZXN0Y2FzZSBJIG1hbmFnZWQgdG8gZ2V0IGZvciB0aGlz IGJ1ZyBsb29wcyBmb3JldmVyIHdoZW4gbm90IGNyYXNoaW5nLgorICAgICAgICBTbyBJIHVzZSBh IDFzIHRpbWVvdXQgdGhyb3VnaCAtLXdhdGNoZG9nPTEwMDAuCisKKyAgICAgICAgKiBzdHJlc3Mv Ym91bmRzLWNoZWNraW5nLWluLWNvbGQtbG9vcC5qczogQWRkZWQuCisgICAgICAgICh0cnVlLnZt LmZ0bFRydWUpOgorCiAyMDIwLTEwLTIxICBDYWl0bGluIFBvdHRlciAgPGNhaXRwQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0pTQ10gc3VwcG9ydCBvcF9nZXRfcHJpdmF0ZV9uYW1lIGluIERGRyBh bmQgRlRMCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9ib3VuZHMtY2hlY2tpbmctaW4tY29s ZC1sb29wLmpzIGIvSlNUZXN0cy9zdHJlc3MvYm91bmRzLWNoZWNraW5nLWluLWNvbGQtbG9vcC5q cwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjI5YjNiMGZhNjA0Mwot LS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL2JvdW5kcy1jaGVja2luZy1pbi1jb2xk LWxvb3AuanMKQEAgLTAsMCArMSwxMiBAQAorLy9AIHJ1bkZUTEVhZ2VyKCItLXdhdGNoZG9nPTEw MDAiLCAiLS13YXRjaGRvZy1leGNlcHRpb24tb2siKQorbGV0IGEgPSBbXTsKK2FbMF0gPSB1bmRl ZmluZWQ7CisKK3doaWxlICh0cnVlKSB7CisgIGxldCBpID0gMDsKKyAgYVswXTsKKyAgd2hpbGUg KCR2bS5mdGxUcnVlKCkpIHsKKyAgICBhW2krK10gPSB1bmRlZmluZWQ7CisgIH0KK30KKwpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggMmU4ZWEyNjQzYWMwLi4xMjVhM2EzYTgxODAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTIyICBSb2JpbiBN b3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5jb20+CisKKyAgICAgICAgREZHSW50ZWdlclJhbmdl T3B0aW1pemF0aW9uIGlzIHdyb25nIGZvciBVcHNpbG9uIChhcyAnc2hhZG93JyBub2RlcyBhcmUg bm90IGluIFNTQSBmb3JtKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE4MDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW4gREZHSW50ZWdlclJhbmdlT3B0aW1pemF0aW9uLCB3aGVuIHZpc2l0aW5nIGFu IFVwc2lsb24gbm9kZSwgd2UgY2FsbCBzZXRFcXVpdmFsZW5jZSwgdGhhdCBjYWxscyBzZXRSZWxh dGlvbnNoaXAuCisgICAgICAgIEJ1dCBkZXNwaXRlIGl0cyBuYW1lLCB0aGlzIGZ1bmN0aW9uIGRv ZXMgbm90IG92ZXJ3cml0ZSBhIHByZS1leGlzdGluZyByZWxhdGlvbnNoaXAsIGl0IHNpbXBseSBy ZXBsYWNlcyBpdCBieSBhbiBvdmVyLWFwcHJveGltYXRpb24gb2YgdGhlIGludGVyc2VjdGlvbiBv ZiB0aGUgb2xkIGFuZCBuZXcgcmVsYXRpb25zaGlwIChzZWUgdGhlIGZpbHRlciBtZXRob2QpLgor ICAgICAgICBTaW5jZSB0aGUgb2xkIHJlbGF0aW9uc2hpcCBpcyBhbHdheXMgKGJ5IGRlZmluaXRp b24pIGFuIG92ZXItYXBwcm94aW1hdGlvbiBvZiB0aGlzIGludGVyc2VjdGlvbiwgaXQgd2lsbCBv ZnRlbiBkbyBub3RoaW5nIGF0IGFsbCBpZiBpdCBjYW5ub3QgZmluZCBhIGNsb3NlciBhcHByb3hp bWF0aW9uLgorICAgICAgICBUaGlzIGlzIGEgcHJvYmxlbSBzcGVjaWZpY2FsbHkgZm9yIFVwc2ls b24gbm9kZXMsIGJlY2F1c2Ugc2V2ZXJhbCBvZiB0aGVtIGNhbiBzdG9yZSB0byB0aGUgc2FtZSAi c2hhZG93IG5vZGUiIGNvcnJlc3BvbmRpbmcgdG8gYSBnaXZlbiBQaGksIHNvIHRoZXkgYXJlIHRo ZSBvbmx5IGNhc2Ugd2hlcmUgdGhlcmUgY2FuIGFscmVhZHkgYmUgYSBjb21wbGV0ZWx5IGRpZmZl cmVudCByZWxhdGlvbnNoaXAgZm9yIHRoZSBzYW1lIG5vZGVzIChjb21pbmcgZnJvbSBhIGRpZmZl cmVudCBVcHNpbG9uKS4KKworICAgICAgICBUaGUgZml4IGlzIHZlcnkgc2ltcGxlIHRoYW5rcyB0 byBhIHN1Z2dlc3Rpb24gYnkgUGhpbDogd2UganVzdCByZW1vdmUgYWxsIHJlbGF0aW9uc2hpcHMg cmVmZXJyaW5nIHRvIHRoZSBzaGFkb3cgbm9kZSBqdXN0IGJlZm9yZSBleGVjdXRpbmcgYW4gVXBz aWxvbi4KKyAgICAgICAgVGhpcyBpcyBjb3JyZWN0IHNpbmNlIHRoZSB1cHNpbG9uIGVmZmVjdGl2 ZWx5IGtpbGxzIHRoYXQgc2hhZG93IG5vZGUsIGJlZm9yZSBtYWtpbmcgaXQgbGl2ZSBhZ2FpbiB3 aXRoIGEgZGlmZmVyZW50IHZhbHVlLCBhbmQgd2UgYWxyZWFkeSBhZ2dyZXNzaXZlbHkgcHJ1bmUg dGhlIHJlbGF0aW9uc2hpcE1hcHMgYnkgbGl2ZW5lc3MuCisKKyAgICAgICAgKiBkZmcvREZHSW50 ZWdlclJhbmdlT3B0aW1pemF0aW9uUGhhc2UuY3BwOgorCiAyMDIwLTEwLTIxICBDYWl0bGluIFBv dHRlciAgPGNhaXRwQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0pTQ10gc3VwcG9ydCBvcF9nZXRf cHJpdmF0ZV9uYW1lIGluIERGRyBhbmQgRlRMCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0ludGVnZXJSYW5nZU9wdGltaXphdGlvblBoYXNlLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHSW50ZWdlclJhbmdlT3B0aW1pemF0aW9uUGhhc2UuY3BwCmlu ZGV4IGQxNDIyMjU0ZWZmYi4uNmNhZTA3ZTkwNmY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0ludGVnZXJSYW5nZU9wdGltaXphdGlvblBoYXNlLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ludGVnZXJSYW5nZU9wdGltaXphdGlvblBoYXNl LmNwcApAQCAtMTUwMyw5ICsxNTAzLDEyIEBAIHByaXZhdGU6CiAgICAgICAgIH0KICAgICAgICAg ICAgIAogICAgICAgICBjYXNlIFVwc2lsb246IHsKLSAgICAgICAgICAgIHNldEVxdWl2YWxlbmNl KAotICAgICAgICAgICAgICAgIG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwKLSAgICAgICAgICAgICAg ICBOb2RlRmxvd1Byb2plY3Rpb24obm9kZS0+cGhpKCksIE5vZGVGbG93UHJvamVjdGlvbjo6U2hh ZG93KSk7CisgICAgICAgICAgICBhdXRvIHNoYWRvd05vZGUgPSBOb2RlRmxvd1Byb2plY3Rpb24o bm9kZS0+cGhpKCksIE5vZGVGbG93UHJvamVjdGlvbjo6U2hhZG93KTsKKyAgICAgICAgICAgIC8v IFdlIG11c3QgZmlyc3QgcmVtb3ZlIGFsbCByZWxhdGlvbnNoaXBzIGludm9sdmluZyB0aGUgc2hh ZG93IG5vZGUsIGJlY2F1c2Ugc2V0RXF1aXZhbGVuY2UgZG9lcyBub3Qgb3ZlcndyaXRlIHRoZW0u CisgICAgICAgICAgICAvLyBPdmVyd3JpdGluZyBpcyBvbmx5IHJlcXVpcmVkIGhlcmUgYmVjYXVz ZSB0aGUgc2hhZG93Tm9kZXMgYXJlIG5vdCBpbiBTU0EgZm9ybSAoY2FuIGJlIHdyaXR0ZW4gdG8g Ynkgc2V2ZXJhbCBVcHNpbG9ucykuCisgICAgICAgICAgICAvLyBBbm90aGVyIHdheSB0byB0aGlu ayBvZiBpdCwgaXMgdGhhdCB3ZSBhcmUgbWFpbnRhaW5pbmcgdGhlIGludmFyaWFudCB0aGF0IHJl bGF0aW9uc2hpcE1hcHMgYXJlIHBydW5lZCBieSBsaXZlbmVzcy4KKyAgICAgICAgICAgIGtpbGwo c2hhZG93Tm9kZSk7CisgICAgICAgICAgICBzZXRFcXVpdmFsZW5jZShub2RlLT5jaGlsZDEoKS5u b2RlKCksIHNoYWRvd05vZGUpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAg ICAgICAgIApAQCAtMTUyMCw2ICsxNTIzLDIyIEBAIHByaXZhdGU6CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgfQogICAgIH0KKworICAgIHZvaWQga2lsbChOb2RlRmxvd1Byb2plY3Rpb24g bm9kZSkKKyAgICB7CisgICAgICAgIG1fcmVsYXRpb25zaGlwcy5yZW1vdmUobm9kZSk7CisKKyAg ICAgICAgZm9yIChhdXRvJiByZWxhdGlvbnNoaXBzIDogbV9yZWxhdGlvbnNoaXBzLnZhbHVlcygp KSB7CisgICAgICAgICAgICB1bnNpZ25lZCBpID0gMCwgaiA9IDA7CisgICAgICAgICAgICB3aGls ZSAoaSA8IHJlbGF0aW9uc2hpcHMuc2l6ZSgpKSB7CisgICAgICAgICAgICAgICAgY29uc3QgUmVs YXRpb25zaGlwJiByZWwgPSByZWxhdGlvbnNoaXBzW2krK107CisgICAgICAgICAgICAgICAgQVNT RVJUKHJlbC5sZWZ0KCkgIT0gbm9kZSk7CisgICAgICAgICAgICAgICAgaWYgKHJlbC5yaWdodCgp ICE9IG5vZGUpCisgICAgICAgICAgICAgICAgICAgIHJlbGF0aW9uc2hpcHNbaisrXSA9IHJlbDsK KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJlbGF0aW9uc2hpcHMuc2hyaW5rKGopOworICAg ICAgICB9CisgICAgfQogICAgIAogICAgIHZvaWQgc2V0RXF1aXZhbGVuY2UoTm9kZUZsb3dQcm9q ZWN0aW9uIG9sZE5vZGUsIE5vZGVGbG93UHJvamVjdGlvbiBuZXdOb2RlKQogICAgIHsKQEAgLTE1 NjAsNyArMTU3OSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIAog ICAgICAgICBpZiAoREZHSW50ZWdlclJhbmdlT3B0aW1pemF0aW9uUGhhc2VJbnRlcm5hbDo6dmVy Ym9zZSkKLSAgICAgICAgICAgIGRhdGFMb2coIiAgICBTZXR0aW5nOiAiLCByZWxhdGlvbnNoaXAs ICIgKHR0bCA9ICIsIHRpbWVUb0xpdmUsICIpXG4iKTsKKyAgICAgICAgICAgIGRhdGFMb2dMbigi ICAgIFNldHRpbmc6ICIsIHJlbGF0aW9uc2hpcCwgIiAodHRsID0gIiwgdGltZVRvTGl2ZSwgIiki KTsKIAogICAgICAgICBhdXRvIHJlc3VsdCA9IHJlbGF0aW9uc2hpcE1hcC5hZGQoCiAgICAgICAg ICAgICByZWxhdGlvbnNoaXAubGVmdCgpLCBWZWN0b3I8UmVsYXRpb25zaGlwPigpKTsKQEAgLTE2 NDIsNiArMTY2MSw4IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgaWYgKFJlbGF0aW9uc2hp cCBmaWx0ZXJlZCA9IG90aGVyUmVsYXRpb25zaGlwLmZpbHRlcihyZWxhdGlvbnNoaXApKSB7CiAg ICAgICAgICAgICAgICAgICAgIEFTU0VSVChmaWx0ZXJlZC5sZWZ0KCkgPT0gcmVsYXRpb25zaGlw LmxlZnQoKSk7CiAgICAgICAgICAgICAgICAgICAgIG90aGVyUmVsYXRpb25zaGlwID0gZmlsdGVy ZWQ7CisgICAgICAgICAgICAgICAgICAgIGlmIChERkdJbnRlZ2VyUmFuZ2VPcHRpbWl6YXRpb25Q aGFzZUludGVybmFsOjp2ZXJib3NlKQorICAgICAgICAgICAgICAgICAgICAgICAgZGF0YUxvZ0xu KCIgICAgICBmaWx0ZXJlZDogIiwgZmlsdGVyZWQpOwogICAgICAgICAgICAgICAgICAgICBmb3Vu ZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQpAQCAtMTY5OSw3ICsx NzIwLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgdG9BZGQuYXBwZW5kKG5ld1Jl bGF0aW9uc2hpcCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgCisKICAgICAg ICAgaWYgKCFmb3VuZCkKICAgICAgICAgICAgIHJlbGF0aW9uc2hpcHMuYXBwZW5kKHJlbGF0aW9u c2hpcCk7CiAgICAgICAgIAo=