215286 2020-08-07 11:59:53 -0700 DFG should always run CFG Simplification after Constant Folding. 2020-08-24 21:32:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist fpizlo mark.lam msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1678679 0 keith_miller 2020-08-07 11:59:53 -0700 DFG should always run CFG Simplification after Constant Folding. 1678683 1 406199 keith_miller 2020-08-07 12:07:37 -0700 Created attachment 406199 Patch 1679019 2 406199 rmorisset 2020-08-10 00:24:40 -0700 Comment on attachment 406199 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406199&action=review > Source/JavaScriptCore/dfg/DFGCFGSimplificationPhase.cpp:-52 > - // FIXME: We should make this work in SSA. https://bugs.webkit.org/show_bug.cgi?id=148260 If this is no longer a FIXME, please close the corresponding bug on bugzilla. > Source/JavaScriptCore/dfg/DFGValidate.cpp:-814 > - bool didSeeExitOK = false; Why did you remove this validation? Can you explain it in the Changelog if it is on purpose? 1679085 3 keith_miller 2020-08-10 09:54:18 -0700 *** Bug 148260 has been marked as a duplicate of this bug. *** 1679089 4 406199 keith_miller 2020-08-10 09:56:18 -0700 Comment on attachment 406199 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=406199&action=review >> Source/JavaScriptCore/dfg/DFGCFGSimplificationPhase.cpp:-52 >> - // FIXME: We should make this work in SSA. https://bugs.webkit.org/show_bug.cgi?id=148260 > > If this is no longer a FIXME, please close the corresponding bug on bugzilla. Done. >> Source/JavaScriptCore/dfg/DFGValidate.cpp:-814 >> - bool didSeeExitOK = false; > > Why did you remove this validation? Can you explain it in the Changelog if it is on purpose? Because it's unnecessary and fails when you merge two blocks where the latter block has a Phi. I'll add a comment to the ChangeLog. 1679110 5 406310 keith_miller 2020-08-10 10:37:35 -0700 Created attachment 406310 Patch 1680395 6 webkit-bug-importer 2020-08-14 12:00:21 -0700 <rdar://problem/67087402> 1682563 7 ews-feeder 2020-08-24 21:32:17 -0700 Committed r266101: <https://trac.webkit.org/changeset/266101> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406310. 406199 2020-08-07 12:07:37 -0700 2020-08-10 10:37:34 -0700 Patch bug-215286-20200807120736.patch text/plain 4538 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz ZDE0MTc4ZTVmNGFjYWZkY2Y0YjFlOWUyNTJhOGY1ODRkNDNkNGM3Li45MWQ2ZGJmNWY1MmIyOTQ5 NjdhMmY3NWM3NmYzZWZlNWJlMzFjMWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMC0wOC0wNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBERkcgc2hvdWxkIGFsd2F5cyBydW4gQ0ZHIFNpbXBsaWZpY2F0aW9u IGFmdGVyIENvbnN0YW50IEZvbGRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDgyNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXZSBkaWRuJ3QgZG8gdGhpcyBvcmlnaW5hbGx5IGJlY2F1c2UgTElD TSwgbWFueSB5ZWFycyBhZ28sIHdhcworICAgICAgICB1bnNvdW5kIGlmIHRoZSBDRkcgZGlkbid0 IGhhdmUgZXhhY3RseSB0aGUgcmlnaHQgc2hhcGUgYXJvdW5kCisgICAgICAgIGxvb3BzLiBUaGlz IGlzIG5vIGxvbmdlciB0cnVlIHNvIHdlIGRvbid0IGhhdmUgdG8gd29ycnkgYWJvdXQKKyAgICAg ICAgY2hhbmdpbmcgdGhlIENGRyBhbnltb3JlLiBXaGlsZSwgdGhpcyBkb2Vzbid0IGFwcGVhciB0 byBiZSBhCisgICAgICAgIHNwZWVkdXAgb24gSmV0U3RyZWFtIDIgQ0ZHLCBwcm9iYWJseSBiZWNh dXNlIHdlJ2QgZXZlbnR1YWxseQorICAgICAgICBzaW1wbGlmeSB0aGUgZ3JhcGggaW4gQjMsIENG RyBTaW1wbGlmaWNhdGlvbiBpcyB2ZXJ5IGNoZWFwIGFuZAorICAgICAgICBtYWtlIG90aGVyIERG RyBvcHRpbWl6YXRpb25zIGVhc2llciBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICogZGZnL0RG R0NGR1NpbXBsaWZpY2F0aW9uUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkNGR1NpbXBs aWZpY2F0aW9uUGhhc2U6OnJ1bik6CisgICAgICAgICogZGZnL0RGR1BsYW4uY3BwOgorICAgICAg ICAoSlNDOjpERkc6OlBsYW46OmNvbXBpbGVJblRocmVhZEltcGwpOgorICAgICAgICAqIGRmZy9E RkdWYWxpZGF0ZS5jcHA6CisKIDIwMjAtMDgtMDUgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxl ckBhcHBsZS5jb20+CiAKICAgICAgICAgVGhlIHZhcmlvdXMgQWxsb3dMaXN0IG9wdGlvbnMgc2hv dWxkIGJlIGFibGUgdG8gdGFrZSB0aGUgZnVuY3Rpb24gbmFtZSBpbmxpbmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ0ZHU2ltcGxpZmljYXRpb25QaGFzZS5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NGR1NpbXBsaWZpY2F0aW9uUGhhc2UuY3Bw CmluZGV4IDQyN2ZjZWY4MTEwYWZhNDA1Mzg4OTA2NWI4NThkZWQzZTJlMTlmYzguLjZkYzBhNGUx NTQzMDc4YjU2ZGM4YzE1OTc1NTU2MzljY2I2M2U4ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHQ0ZHU2ltcGxpZmljYXRpb25QaGFzZS5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDRkdTaW1wbGlmaWNhdGlvblBoYXNlLmNwcApAQCAtNDks OSArNDksNiBAQCBwdWJsaWM6CiAgICAgCiAgICAgYm9vbCBydW4oKQogICAgIHsKLSAgICAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBtYWtlIHRoaXMgd29yayBpbiBTU0EuIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgyNjAKLSAgICAgICAgREZHX0FTU0VSVChtX2dy YXBoLCBudWxscHRyLCBtX2dyYXBoLm1fZm9ybSAhPSBTU0EpOwotICAgICAgICAKICAgICAgICAg Y29uc3QgYm9vbCBleHRyZW1lTG9nZ2luZyA9IGZhbHNlOwogCiAgICAgICAgIGJvb2wgb3V0ZXJD aGFuZ2VkID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1BsYW4uY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFuLmNwcAppbmRleCA1 YWRlOWM5NWEwNGVjNjU0YmUyOTJlYWQxMTU1NGI4NDlmYWU2OTMzLi5mMTEyY2JlOGIxMzIxMjE4 ZmFkZTRkMWM0ODFkNzE4YTcxNzdmZjg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR1BsYW4uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxh bi5jcHAKQEAgLTM2NSw2ICszNjUsNyBAQCBQbGFuOjpDb21waWxhdGlvblBhdGggUGxhbjo6Y29t cGlsZUluVGhyZWFkSW1wbCgpCiAgICAgaWYgKGNoYW5nZWQpIHsKICAgICAgICAgUlVOX1BIQVNF KHBlcmZvcm1DRkEpOwogICAgICAgICBSVU5fUEhBU0UocGVyZm9ybUNvbnN0YW50Rm9sZGluZyk7 CisgICAgICAgIFJVTl9QSEFTRShwZXJmb3JtQ0ZHU2ltcGxpZmljYXRpb24pOwogICAgIH0KICAg ICAKICAgICAvLyBJZiB3ZSdyZSBkb2luZyB2YWxpZGF0aW9uLCB0aGVuIHJ1biBzb21lIGFuYWx5 c2VzLCB0byBnaXZlIHRoZW0gYW4gb3Bwb3J0dW5pdHkKQEAgLTQzMCw2ICs0MzEsNyBAQCBQbGFu OjpDb21waWxhdGlvblBhdGggUGxhbjo6Y29tcGlsZUluVGhyZWFkSW1wbCgpCiAgICAgICAgIFJV Tl9QSEFTRShwZXJmb3JtTGl2ZW5lc3NBbmFseXNpcyk7CiAgICAgICAgIFJVTl9QSEFTRShwZXJm b3JtQ0ZBKTsKICAgICAgICAgUlVOX1BIQVNFKHBlcmZvcm1Db25zdGFudEZvbGRpbmcpOworICAg ICAgICBSVU5fUEhBU0UocGVyZm9ybUNGR1NpbXBsaWZpY2F0aW9uKTsKICAgICAgICAgUlVOX1BI QVNFKHBlcmZvcm1DbGVhblVwKTsgLy8gUmVkdWNlIHRoZSBncmFwaCBzaXplIGEgbG90LgogICAg ICAgICBjaGFuZ2VkID0gZmFsc2U7CiAgICAgICAgIFJVTl9QSEFTRShwZXJmb3JtU3RyZW5ndGhS ZWR1Y3Rpb24pOwpAQCAtNDQ1LDYgKzQ0Nyw3IEBAIFBsYW46OkNvbXBpbGF0aW9uUGF0aCBQbGFu Ojpjb21waWxlSW5UaHJlYWRJbXBsKCkKICAgICAgICAgICAgIFJVTl9QSEFTRShwZXJmb3JtTGl2 ZW5lc3NBbmFseXNpcyk7CiAgICAgICAgICAgICBSVU5fUEhBU0UocGVyZm9ybUNGQSk7CiAgICAg ICAgICAgICBSVU5fUEhBU0UocGVyZm9ybUNvbnN0YW50Rm9sZGluZyk7CisgICAgICAgICAgICBS VU5fUEhBU0UocGVyZm9ybUNGR1NpbXBsaWZpY2F0aW9uKTsKICAgICAgICAgfQogICAgICAgICAK ICAgICAgICAgLy8gQ3VycmVudGx5LCB0aGlzIHJlbGllcyBvbiBwcmUtaGVhZGVycyBzdGlsbCBi ZWluZyB2YWxpZC4gVGhhdCBwcmVjbHVkZXMgcnVubmluZyBDRkcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHVmFsaWRhdGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdWYWxpZGF0ZS5jcHAKaW5kZXggNDc5NGE2MGYyMGRhNDhiOGVhYWRmNjA0MGNj OTgyYWFiNWNhODNjZS4uZTRlYzIxYjkzNzg3YjZkMDRiNTY3OTM3ODY2MzIwZTM3YjE5ZjMwNSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdWYWxpZGF0ZS5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdWYWxpZGF0ZS5jcHAKQEAgLTgxMSwyMiAr ODExLDE2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAKICAgICAgICAgICAgIFZBTElEQVRFKChi bG9jayksIGJsb2NrLT5waGlzLmlzRW1wdHkoKSk7CiAKLSAgICAgICAgICAgIGJvb2wgZGlkU2Vl RXhpdE9LID0gZmFsc2U7CiAgICAgICAgICAgICBib29sIGlzT1NSRXhpdGVkID0gZmFsc2U7CiAg ICAgICAgICAgICAKICAgICAgICAgICAgIEhhc2hTZXQ8Tm9kZSo+IG5vZGVzSW5UaGlzQmxvY2s7 CiAKICAgICAgICAgICAgIGZvciAoYXV0byogbm9kZSA6ICpibG9jaykgewotICAgICAgICAgICAg ICAgIGRpZFNlZUV4aXRPSyB8PSBub2RlLT5vcmlnaW4uZXhpdE9LOwogICAgICAgICAgICAgICAg IHN3aXRjaCAobm9kZS0+b3AoKSkgewogICAgICAgICAgICAgICAgIGNhc2UgUGhpOgogICAgICAg ICAgICAgICAgICAgICAvLyBQaGkgY2Fubm90IGV4aXQsIGFuZCBpdCB3b3VsZCBiZSB3cm9uZyB0 byBob2lzdCBhbnl0aGluZyB0byB0aGUgUGhpIHRoYXQgY291bGQKICAgICAgICAgICAgICAgICAg ICAgLy8gZXhpdC4KICAgICAgICAgICAgICAgICAgICAgVkFMSURBVEUoKG5vZGUpLCAhbm9kZS0+ b3JpZ2luLmV4aXRPSyk7Ci0KLSAgICAgICAgICAgICAgICAgICAgLy8gSXQgbmV2ZXIgbWFrZXMg c2Vuc2UgdG8gaGF2ZSBleGl0T0sgYW55d2hlcmUgaW4gdGhlIGJsb2NrIGJlZm9yZSBhIFBoaS4g SXQncyBvbmx5Ci0gICAgICAgICAgICAgICAgICAgIC8vIE9LIHRvIGV4aXQgYWZ0ZXIgYWxsIFBo aXMgYXJlIGRvbmUuCi0gICAgICAgICAgICAgICAgICAgIFZBTElEQVRFKChub2RlKSwgIWRpZFNl ZUV4aXRPSyk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAg ICAKICAgICAgICAgICAgICAgICBjYXNlIEdldExvY2FsOgo= 406310 2020-08-10 10:37:35 -0700 2020-08-24 21:32:18 -0700 Patch bug-215286-20200810103735.patch text/plain 4756 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1Mjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz ZDE0MTc4ZTVmNGFjYWZkY2Y0YjFlOWUyNTJhOGY1ODRkNDNkNGM3Li44YTY0ZDY1MDg2YmY4MzE4 OTAyYTA3ZjI3NTRkOTM3ZDU0MjEyODhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAyMC0wOC0wNyAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBERkcgc2hvdWxkIGFsd2F5cyBydW4gQ0ZHIFNpbXBsaWZpY2F0aW9u IGFmdGVyIENvbnN0YW50IEZvbGRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTUyODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXZSBkaWRuJ3QgZG8gdGhpcyBvcmlnaW5hbGx5IGJlY2F1c2UgTElD TSwgbWFueSB5ZWFycyBhZ28sIHdhcworICAgICAgICB1bnNvdW5kIGlmIHRoZSBDRkcgZGlkbid0 IGhhdmUgZXhhY3RseSB0aGUgcmlnaHQgc2hhcGUgYXJvdW5kCisgICAgICAgIGxvb3BzLiBUaGlz IGlzIG5vIGxvbmdlciB0cnVlIHNvIHdlIGRvbid0IGhhdmUgdG8gd29ycnkgYWJvdXQKKyAgICAg ICAgY2hhbmdpbmcgdGhlIENGRyBhbnltb3JlLiBXaGlsZSwgdGhpcyBkb2Vzbid0IGFwcGVhciB0 byBiZSBhCisgICAgICAgIHNwZWVkdXAgb24gSmV0U3RyZWFtIDIgQ0ZHLCBwcm9iYWJseSBiZWNh dXNlIHdlJ2QgZXZlbnR1YWxseQorICAgICAgICBzaW1wbGlmeSB0aGUgZ3JhcGggaW4gQjMsIENG RyBTaW1wbGlmaWNhdGlvbiBpcyB2ZXJ5IGNoZWFwIGFuZAorICAgICAgICBtYWtlIG90aGVyIERG RyBvcHRpbWl6YXRpb25zIGVhc2llciBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgIEFsc28sIHJl bW92ZSB1bmVjZXNzYXJ5IHZhbGlkYXRpb24gcnVsZSB0aGF0IG5vIGV4aXRPS3MgY2FuIGNvbWUK KyAgICAgICAgYmVmb3JlIGFueSBQaGkgbm9kZXMgaW4gREZHLiBUaGlzIGlzbid0IHJlcXVpcmVk IGFuZCBmYWlscyBhZnRlcgorICAgICAgICBtZXJnaW5nIHR3byBiYXNpYyBibG9ja3Mgd2hlcmUg dGhlIGxhdHRlciBibG9jayBoYXMgYSBQaGkuCisKKyAgICAgICAgKiBkZmcvREZHQ0ZHU2ltcGxp ZmljYXRpb25QaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Q0ZHU2ltcGxpZmljYXRpb25Q aGFzZTo6cnVuKToKKyAgICAgICAgKiBkZmcvREZHUGxhbi5jcHA6CisgICAgICAgIChKU0M6OkRG Rzo6UGxhbjo6Y29tcGlsZUluVGhyZWFkSW1wbCk6CisgICAgICAgICogZGZnL0RGR1ZhbGlkYXRl LmNwcDoKKwogMjAyMC0wOC0wNSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNv bT4KIAogICAgICAgICBUaGUgdmFyaW91cyBBbGxvd0xpc3Qgb3B0aW9ucyBzaG91bGQgYmUgYWJs ZSB0byB0YWtlIHRoZSBmdW5jdGlvbiBuYW1lIGlubGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdDRkdTaW1wbGlmaWNhdGlvblBoYXNlLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQ0ZHU2ltcGxpZmljYXRpb25QaGFzZS5jcHAKaW5kZXggNDI3 ZmNlZjgxMTBhZmE0MDUzODg5MDY1Yjg1OGRlZDNlMmUxOWZjOC4uNmRjMGE0ZTE1NDMwNzhiNTZk YzhjMTU5NzU1NTYzOWNjYjYzZThkMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdDRkdTaW1wbGlmaWNhdGlvblBoYXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0NGR1NpbXBsaWZpY2F0aW9uUGhhc2UuY3BwCkBAIC00OSw5ICs0OSw2IEBA IHB1YmxpYzoKICAgICAKICAgICBib29sIHJ1bigpCiAgICAgewotICAgICAgICAvLyBGSVhNRTog V2Ugc2hvdWxkIG1ha2UgdGhpcyB3b3JrIGluIFNTQS4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0ODI2MAotICAgICAgICBERkdfQVNTRVJUKG1fZ3JhcGgsIG51bGxw dHIsIG1fZ3JhcGgubV9mb3JtICE9IFNTQSk7Ci0gICAgICAgIAogICAgICAgICBjb25zdCBib29s IGV4dHJlbWVMb2dnaW5nID0gZmFsc2U7CiAKICAgICAgICAgYm9vbCBvdXRlckNoYW5nZWQgPSBm YWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxhbi5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1BsYW4uY3BwCmluZGV4IDVhZGU5Yzk1YTA0 ZWM2NTRiZTI5MmVhZDExNTU0Yjg0OWZhZTY5MzMuLmYxMTJjYmU4YjEzMjEyMThmYWRlNGQxYzQ4 MWQ3MThhNzE3N2ZmODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH UGxhbi5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQbGFuLmNwcApAQCAt MzY1LDYgKzM2NSw3IEBAIFBsYW46OkNvbXBpbGF0aW9uUGF0aCBQbGFuOjpjb21waWxlSW5UaHJl YWRJbXBsKCkKICAgICBpZiAoY2hhbmdlZCkgewogICAgICAgICBSVU5fUEhBU0UocGVyZm9ybUNG QSk7CiAgICAgICAgIFJVTl9QSEFTRShwZXJmb3JtQ29uc3RhbnRGb2xkaW5nKTsKKyAgICAgICAg UlVOX1BIQVNFKHBlcmZvcm1DRkdTaW1wbGlmaWNhdGlvbik7CiAgICAgfQogICAgIAogICAgIC8v IElmIHdlJ3JlIGRvaW5nIHZhbGlkYXRpb24sIHRoZW4gcnVuIHNvbWUgYW5hbHlzZXMsIHRvIGdp dmUgdGhlbSBhbiBvcHBvcnR1bml0eQpAQCAtNDMwLDYgKzQzMSw3IEBAIFBsYW46OkNvbXBpbGF0 aW9uUGF0aCBQbGFuOjpjb21waWxlSW5UaHJlYWRJbXBsKCkKICAgICAgICAgUlVOX1BIQVNFKHBl cmZvcm1MaXZlbmVzc0FuYWx5c2lzKTsKICAgICAgICAgUlVOX1BIQVNFKHBlcmZvcm1DRkEpOwog ICAgICAgICBSVU5fUEhBU0UocGVyZm9ybUNvbnN0YW50Rm9sZGluZyk7CisgICAgICAgIFJVTl9Q SEFTRShwZXJmb3JtQ0ZHU2ltcGxpZmljYXRpb24pOwogICAgICAgICBSVU5fUEhBU0UocGVyZm9y bUNsZWFuVXApOyAvLyBSZWR1Y2UgdGhlIGdyYXBoIHNpemUgYSBsb3QuCiAgICAgICAgIGNoYW5n ZWQgPSBmYWxzZTsKICAgICAgICAgUlVOX1BIQVNFKHBlcmZvcm1TdHJlbmd0aFJlZHVjdGlvbik7 CkBAIC00NDUsNiArNDQ3LDcgQEAgUGxhbjo6Q29tcGlsYXRpb25QYXRoIFBsYW46OmNvbXBpbGVJ blRocmVhZEltcGwoKQogICAgICAgICAgICAgUlVOX1BIQVNFKHBlcmZvcm1MaXZlbmVzc0FuYWx5 c2lzKTsKICAgICAgICAgICAgIFJVTl9QSEFTRShwZXJmb3JtQ0ZBKTsKICAgICAgICAgICAgIFJV Tl9QSEFTRShwZXJmb3JtQ29uc3RhbnRGb2xkaW5nKTsKKyAgICAgICAgICAgIFJVTl9QSEFTRShw ZXJmb3JtQ0ZHU2ltcGxpZmljYXRpb24pOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICAv LyBDdXJyZW50bHksIHRoaXMgcmVsaWVzIG9uIHByZS1oZWFkZXJzIHN0aWxsIGJlaW5nIHZhbGlk LiBUaGF0IHByZWNsdWRlcyBydW5uaW5nIENGRwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdWYWxpZGF0ZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1ZhbGlkYXRlLmNwcAppbmRleCA0Nzk0YTYwZjIwZGE0OGI4ZWFhZGY2MDQwY2M5ODJhYWI1Y2E4 M2NlLi5lNGVjMjFiOTM3ODdiNmQwNGI1Njc5Mzc4NjYzMjBlMzdiMTlmMzA1IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ZhbGlkYXRlLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1ZhbGlkYXRlLmNwcApAQCAtODExLDIyICs4MTEsMTYgQEAg cHJpdmF0ZToKICAgICAgICAgICAgIAogICAgICAgICAgICAgVkFMSURBVEUoKGJsb2NrKSwgYmxv Y2stPnBoaXMuaXNFbXB0eSgpKTsKIAotICAgICAgICAgICAgYm9vbCBkaWRTZWVFeGl0T0sgPSBm YWxzZTsKICAgICAgICAgICAgIGJvb2wgaXNPU1JFeGl0ZWQgPSBmYWxzZTsKICAgICAgICAgICAg IAogICAgICAgICAgICAgSGFzaFNldDxOb2RlKj4gbm9kZXNJblRoaXNCbG9jazsKIAogICAgICAg ICAgICAgZm9yIChhdXRvKiBub2RlIDogKmJsb2NrKSB7Ci0gICAgICAgICAgICAgICAgZGlkU2Vl RXhpdE9LIHw9IG5vZGUtPm9yaWdpbi5leGl0T0s7CiAgICAgICAgICAgICAgICAgc3dpdGNoIChu b2RlLT5vcCgpKSB7CiAgICAgICAgICAgICAgICAgY2FzZSBQaGk6CiAgICAgICAgICAgICAgICAg ICAgIC8vIFBoaSBjYW5ub3QgZXhpdCwgYW5kIGl0IHdvdWxkIGJlIHdyb25nIHRvIGhvaXN0IGFu eXRoaW5nIHRvIHRoZSBQaGkgdGhhdCBjb3VsZAogICAgICAgICAgICAgICAgICAgICAvLyBleGl0 LgogICAgICAgICAgICAgICAgICAgICBWQUxJREFURSgobm9kZSksICFub2RlLT5vcmlnaW4uZXhp dE9LKTsKLQotICAgICAgICAgICAgICAgICAgICAvLyBJdCBuZXZlciBtYWtlcyBzZW5zZSB0byBo YXZlIGV4aXRPSyBhbnl3aGVyZSBpbiB0aGUgYmxvY2sgYmVmb3JlIGEgUGhpLiBJdCdzIG9ubHkK LSAgICAgICAgICAgICAgICAgICAgLy8gT0sgdG8gZXhpdCBhZnRlciBhbGwgUGhpcyBhcmUgZG9u ZS4KLSAgICAgICAgICAgICAgICAgICAgVkFMSURBVEUoKG5vZGUpLCAhZGlkU2VlRXhpdE9LKTsK ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIAogICAgICAg ICAgICAgICAgIGNhc2UgR2V0TG9jYWw6Cg==