203696 2019-10-31 13:46:09 -0700 [JSC] Make String#localeCompare faster by inlining JSGlobalObject::defaultCollator 2019-10-31 14:54:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1586058 0 ysuzuki 2019-10-31 13:46:09 -0700 [JSC] Make String#localeCompare faster by inlining JSGlobalObject::defaultCollator 1586059 1 382497 ysuzuki 2019-10-31 13:47:12 -0700 Created attachment 382497 Patch 1586065 2 382497 mark.lam 2019-10-31 14:00:48 -0700 Comment on attachment 382497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382497&action=review r=me with fix and if EWS bots are green. > Source/JavaScriptCore/runtime/JSGlobalObject.cpp:903 > + scope.assertNoException(); Since you're expecting no exception, use DECLARE_CATCH_SCOPE instead of DECLARE_THROW_SCOPE? Might as well make this a releaseAssertNoException() too. 1586066 3 382497 ysuzuki 2019-10-31 14:01:35 -0700 Comment on attachment 382497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382497&action=review >> Source/JavaScriptCore/runtime/JSGlobalObject.cpp:903 >> + scope.assertNoException(); > > Since you're expecting no exception, use DECLARE_CATCH_SCOPE instead of DECLARE_THROW_SCOPE? Might as well make this a releaseAssertNoException() too. Sounds nice. Fixed. 1586085 4 ysuzuki 2019-10-31 14:53:23 -0700 Committed r251882: <https://trac.webkit.org/changeset/251882> 1586087 5 webkit-bug-importer 2019-10-31 14:54:16 -0700 <rdar://problem/56796383> 382497 2019-10-31 13:47:12 -0700 2019-10-31 14:00:48 -0700 Patch bug-203696-20191031134711.patch text/plain 8810 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj OGQ1YjhiNDRjMDU4NjNmMjhjMDZhNDhmYzFjZWNjM2U1ZGFjZmE1Li4wMjZlNjliNWIyMTRhN2Jl MDNhN2ZjNDgyYThlNmE3NjNhNDFiODI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxOS0xMC0zMSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIE1ha2UgU3RyaW5nI2xvY2FsZUNvbXBhcmUgZmFzdGVyIGJ5IGlu bGluaW5nIEpTR2xvYmFsT2JqZWN0OjpkZWZhdWx0Q29sbGF0b3IKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzY5NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGZvdW5kIHRoYXQgSlNHbG9iYWxPYmpl Y3Q6OmRlZmF1bHRDb2xsYXRvciBpcyBub3QgaW5saW5lZCBhbmQgaXQgdGFrZXMgc29tZSB0aW1l IGluIEpldFN0cmVhbTIvY2Rqcy4KKyAgICAgICAgV2UgdXNlIExhenlQcm9wZXJ0eSBtZWNoYW5p c20gaGVyZSBhbmQgbWFrZSBKU0dsb2JhbE9iamVjdDo6ZGVmYXVsdENvbGxhdG9yIGZ1bmN0aW9u IGlubGluYWJsZSBzaW1wbGUgb25lLgorICAgICAgICBUaGlzIHBhdGNoIGltcHJvdmVzIEpldFN0 cmVhbTIvY2RqcyBieSAyJS4KKworICAgICAgICAqIHJ1bnRpbWUvSW50bENvbGxhdG9yLmNwcDoK KyAgICAgICAgKEpTQzo6SW50bENvbGxhdG9yOjppbml0aWFsaXplQ29sbGF0b3IpOgorICAgICAg ICAqIHJ1bnRpbWUvSW50bE9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OmludGxCb29sZWFuT3B0 aW9uKToKKyAgICAgICAgKEpTQzo6aW50bFN0cmluZ09wdGlvbik6CisgICAgICAgIChKU0M6Omlu dGxOdW1iZXJPcHRpb24pOgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwOgor ICAgICAgICAoSlNDOjpKU0dsb2JhbE9iamVjdDo6aW5pdCk6CisgICAgICAgIChKU0M6OkpTR2xv YmFsT2JqZWN0Ojp2aXNpdENoaWxkcmVuKToKKyAgICAgICAgKEpTQzo6SlNHbG9iYWxPYmplY3Q6 OmRlZmF1bHRDb2xsYXRvcik6IERlbGV0ZWQuCisgICAgICAgICogcnVudGltZS9KU0dsb2JhbE9i amVjdC5oOgorICAgICAgICAoSlNDOjpKU0dsb2JhbE9iamVjdDo6ZGVmYXVsdENvbGxhdG9yIGNv bnN0KToKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHA6CisgICAgICAgIChK U0M6OnN0cmluZ1Byb3RvRnVuY0xvY2FsZUNvbXBhcmUpOgorCiAyMDE5LTEwLTMxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ01ha2UgYnVp bGQgc2hvdWxkIG1ha2UgV2ViS2l0IGZyYW1ld29yayBhYmxlIHRvIGJlIHVzZWQgYnkgU2FmYXJp CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsQ29sbGF0b3Iu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bENvbGxhdG9yLmNwcAppbmRl eCAzODNjNjdhNjczODU5OGQyNWVkYjczZDFlMjk0MjRlYTI4NDU5N2ZhLi4xYjE5Nzg2ZWRhODE4 NmVlOGQ5M2M5Y2M4NWZkZTExNWM5ZWQ2ODA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9JbnRsQ29sbGF0b3IuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0ludGxDb2xsYXRvci5jcHAKQEAgLTE4NCwxMCArMTg0LDggQEAgdm9pZCBJbnRs Q29sbGF0b3I6OmluaXRpYWxpemVDb2xsYXRvcihKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0 LCBKU1ZhbHVlIGxvY2EKICAgICBhdXRvIHJlcXVlc3RlZExvY2FsZXMgPSBjYW5vbmljYWxpemVM b2NhbGVMaXN0KGdsb2JhbE9iamVjdCwgbG9jYWxlcyk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElP TihzY29wZSwgdm9pZCgpKTsKIAotICAgIEpTT2JqZWN0KiBvcHRpb25zOwotICAgIGlmIChvcHRp b25zVmFsdWUuaXNVbmRlZmluZWQoKSkKLSAgICAgICAgb3B0aW9ucyA9IGNvbnN0cnVjdEVtcHR5 T2JqZWN0KHZtLCBnbG9iYWxPYmplY3QtPm51bGxQcm90b3R5cGVPYmplY3RTdHJ1Y3R1cmUoKSk7 Ci0gICAgZWxzZSB7CisgICAgSlNWYWx1ZSBvcHRpb25zID0gb3B0aW9uc1ZhbHVlOworICAgIGlm ICghb3B0aW9uc1ZhbHVlLmlzVW5kZWZpbmVkKCkpIHsKICAgICAgICAgb3B0aW9ucyA9IG9wdGlv bnNWYWx1ZS50b09iamVjdChnbG9iYWxPYmplY3QpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHNjb3BlLCB2b2lkKCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0ludGxPYmplY3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSW50bE9iamVjdC5jcHAKaW5kZXggMjRmZjc2YmNhNjI2MzEwN2Q3OGJkYzIzYTdhNmZjOThl ZDhlODEyMC4uMzhlNzUyZDNkYWQ1NTNkMDI5YzgyZWVlMGJhNzg4ZGQ2YWM5YTk2OCAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE9iamVjdC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE9iamVjdC5jcHAKQEAgLTE1MSw2ICsx NTEsMTEgQEAgYm9vbCBpbnRsQm9vbGVhbk9wdGlvbihKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq ZWN0LCBKU1ZhbHVlIG9wdGlvbnMsIFByb3BlcnR5TmEKICAgICBWTSYgdm0gPSBnbG9iYWxPYmpl Y3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCisg ICAgaWYgKG9wdGlvbnMuaXNVbmRlZmluZWQoKSkgeworICAgICAgICB1c2VzRmFsbGJhY2sgPSB0 cnVlOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCiAgICAgSlNPYmplY3QqIG9wdHMg PSBvcHRpb25zLnRvT2JqZWN0KGdsb2JhbE9iamVjdCk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElP TihzY29wZSwgZmFsc2UpOwogCkBAIC0xNzYsNiArMTgxLDkgQEAgU3RyaW5nIGludGxTdHJpbmdP cHRpb24oSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNWYWx1ZSBvcHRpb25zLCBQcm9w ZXJ0eU4KICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9 IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCisgICAgaWYgKG9wdGlvbnMuaXNVbmRlZmluZWQo KSkKKyAgICAgICAgcmV0dXJuIGZhbGxiYWNrOworCiAgICAgSlNPYmplY3QqIG9wdHMgPSBvcHRp b25zLnRvT2JqZWN0KGdsb2JhbE9iamVjdCk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29w ZSwgU3RyaW5nKCkpOwogCkBAIC0yMDQsNiArMjEyLDkgQEAgdW5zaWduZWQgaW50bE51bWJlck9w dGlvbihKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIG9wdGlvbnMsIFByb3Bl cnQKICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERF Q0xBUkVfVEhST1dfU0NPUEUodm0pOwogCisgICAgaWYgKG9wdGlvbnMuaXNVbmRlZmluZWQoKSkK KyAgICAgICAgcmV0dXJuIGZhbGxiYWNrOworCiAgICAgSlNPYmplY3QqIG9wdHMgPSBvcHRpb25z LnRvT2JqZWN0KGdsb2JhbE9iamVjdCk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg MCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFs T2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0 LmNwcAppbmRleCA5ZTA5ZmJiNGE1NDY5ODBmOTAzYTQzNTM5Y2NiNWQ0YzQ3YWUyNWQxLi5hZjAx MThiODE2ZGM3ODZmMTk2MzJiM2ZjMWRiNWM1YjI1ZTMwMDM0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCkBAIC04OTMsNiArODkzLDE2 IEBAIGNhcGl0YWxOYW1lICMjIENvbnN0cnVjdG9yKiBsb3dlck5hbWUgIyMgQ29uc3RydWN0b3Ig PSBmZWF0dXJlRmxhZyA/IGNhcGl0YWxOYW1lCiAgICAgICAgICAgICBJbnRsUGx1cmFsUnVsZXNQ cm90b3R5cGUqIHBsdXJhbFJ1bGVzUHJvdG90eXBlID0gSW50bFBsdXJhbFJ1bGVzUHJvdG90eXBl OjpjcmVhdGUoaW5pdC52bSwgZ2xvYmFsT2JqZWN0LCBJbnRsUGx1cmFsUnVsZXNQcm90b3R5cGU6 OmNyZWF0ZVN0cnVjdHVyZShpbml0LnZtLCBnbG9iYWxPYmplY3QsIGdsb2JhbE9iamVjdC0+b2Jq ZWN0UHJvdG90eXBlKCkpKTsKICAgICAgICAgICAgIGluaXQuc2V0KEludGxQbHVyYWxSdWxlczo6 Y3JlYXRlU3RydWN0dXJlKGluaXQudm0sIGdsb2JhbE9iamVjdCwgcGx1cmFsUnVsZXNQcm90b3R5 cGUpKTsKICAgICAgICAgfSk7CisgICAgbV9kZWZhdWx0Q29sbGF0b3IuaW5pdExhdGVyKAorICAg ICAgICBbXSAoY29uc3QgSW5pdGlhbGl6ZXI8SW50bENvbGxhdG9yPiYgaW5pdCkgeworICAgICAg ICAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IGpzQ2FzdDxKU0dsb2JhbE9iamVj dCo+KGluaXQub3duZXIpOworICAgICAgICAgICAgVk0mIHZtID0gaW5pdC52bTsKKyAgICAgICAg ICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKyAgICAgICAgICAgIElu dGxDb2xsYXRvciogY29sbGF0b3IgPSBJbnRsQ29sbGF0b3I6OmNyZWF0ZSh2bSwgZ2xvYmFsT2Jq ZWN0LT5jb2xsYXRvclN0cnVjdHVyZSgpKTsKKyAgICAgICAgICAgIGNvbGxhdG9yLT5pbml0aWFs aXplQ29sbGF0b3IoZ2xvYmFsT2JqZWN0LCBqc1VuZGVmaW5lZCgpLCBqc1VuZGVmaW5lZCgpKTsK KyAgICAgICAgICAgIHNjb3BlLmFzc2VydE5vRXhjZXB0aW9uKCk7CisgICAgICAgICAgICBpbml0 LnNldChjb2xsYXRvcik7CisgICAgICAgIH0pOwogCiAgICAgSW50bE9iamVjdCogaW50bCA9IElu dGxPYmplY3Q6OmNyZWF0ZSh2bSwgSW50bE9iamVjdDo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlz LCBtX29iamVjdFByb3RvdHlwZS5nZXQoKSkpOwogICAgIHB1dERpcmVjdFdpdGhvdXRUcmFuc2l0 aW9uKHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5JbnRsLCBpbnRsLCBzdGF0aWNfY2FzdDx1bnNpZ25l ZD4oUHJvcGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtKSk7CkBAIC0xNjkwLDcgKzE3MDAsNyBAQCB2 b2lkIEpTR2xvYmFsT2JqZWN0Ojp2aXNpdENoaWxkcmVuKEpTQ2VsbCogY2VsbCwgU2xvdFZpc2l0 b3ImIHZpc2l0b3IpCiAgICAgdmlzaXRvci5hcHBlbmQodGhpc09iamVjdC0+bV9pbnRlcm5hbFBy b21pc2VDb25zdHJ1Y3Rvcik7CiAKICNpZiBFTkFCTEUoSU5UTCkKLSAgICB2aXNpdG9yLmFwcGVu ZCh0aGlzT2JqZWN0LT5tX2RlZmF1bHRDb2xsYXRvcik7CisgICAgdGhpc09iamVjdC0+bV9kZWZh dWx0Q29sbGF0b3IudmlzaXQodmlzaXRvcik7CiAgICAgdGhpc09iamVjdC0+bV9jb2xsYXRvclN0 cnVjdHVyZS52aXNpdCh2aXNpdG9yKTsKICAgICB0aGlzT2JqZWN0LT5tX251bWJlckZvcm1hdFN0 cnVjdHVyZS52aXNpdCh2aXNpdG9yKTsKICAgICB0aGlzT2JqZWN0LT5tX2RhdGVUaW1lRm9ybWF0 U3RydWN0dXJlLnZpc2l0KHZpc2l0b3IpOwpAQCAtMjA2MCwyMSArMjA3MCw2IEBAIGNvbnN0IEhh c2hTZXQ8U3RyaW5nPiYgSlNHbG9iYWxPYmplY3Q6OmludGxQbHVyYWxSdWxlc0F2YWlsYWJsZUxv Y2FsZXMoKQogICAgIHJldHVybiBtX2ludGxQbHVyYWxSdWxlc0F2YWlsYWJsZUxvY2FsZXM7CiB9 CiAKLUludGxDb2xsYXRvciogSlNHbG9iYWxPYmplY3Q6OmRlZmF1bHRDb2xsYXRvcihKU0dsb2Jh bE9iamVjdCogZ2xvYmFsT2JqZWN0KQotewotICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+dm0o KTsKLSAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7Ci0KLSAgICBpZiAo bV9kZWZhdWx0Q29sbGF0b3IpCi0gICAgICAgIHJldHVybiBtX2RlZmF1bHRDb2xsYXRvci5nZXQo KTsKLQotICAgIEludGxDb2xsYXRvciogY29sbGF0b3IgPSBJbnRsQ29sbGF0b3I6OmNyZWF0ZSh2 bSwgY29sbGF0b3JTdHJ1Y3R1cmUoKSk7Ci0gICAgY29sbGF0b3ItPmluaXRpYWxpemVDb2xsYXRv cihnbG9iYWxPYmplY3QsIGpzVW5kZWZpbmVkKCksIGpzVW5kZWZpbmVkKCkpOwotICAgIFJFVFVS Tl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIpOwotICAgIG1fZGVmYXVsdENvbGxhdG9yLnNl dCh2bSwgdGhpcywgY29sbGF0b3IpOwotICAgIHJldHVybiBjb2xsYXRvcjsKLX0KLQogI2VuZGlm IC8vIEVOQUJMRShJTlRMKQogCiB2b2lkIEpTR2xvYmFsT2JqZWN0OjpidW1wR2xvYmFsTGV4aWNh bEJpbmRpbmdFcG9jaChWTSYgdm0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU0dsb2JhbE9iamVjdC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNHbG9iYWxPYmplY3QuaAppbmRleCAyNDg3MDhkNDEzNWIzNTgzMmI1MzNhOWRhYjIxM2M3MWY3 MGExMjBjLi44OTI2YWFhZGZkNjhkMWFmMTI5MjgwNGUyZDAzNDIyZDdmZjQ0ZjY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmgKQEAgLTI4NSw3 ICsyODUsNyBAQCBjbGFzcyBKU0dsb2JhbE9iamVjdCA6IHB1YmxpYyBKU1NlZ21lbnRlZFZhcmlh YmxlT2JqZWN0IHsKICAgICBXcml0ZUJhcnJpZXI8SlNJbnRlcm5hbFByb21pc2VDb25zdHJ1Y3Rv cj4gbV9pbnRlcm5hbFByb21pc2VDb25zdHJ1Y3RvcjsKIAogI2lmIEVOQUJMRShJTlRMKQotICAg IFdyaXRlQmFycmllcjxJbnRsQ29sbGF0b3I+IG1fZGVmYXVsdENvbGxhdG9yOworICAgIExhenlQ cm9wZXJ0eTxKU0dsb2JhbE9iamVjdCwgSW50bENvbGxhdG9yPiBtX2RlZmF1bHRDb2xsYXRvcjsK ICAgICBMYXp5UHJvcGVydHk8SlNHbG9iYWxPYmplY3QsIFN0cnVjdHVyZT4gbV9jb2xsYXRvclN0 cnVjdHVyZTsKICAgICBMYXp5UHJvcGVydHk8SlNHbG9iYWxPYmplY3QsIFN0cnVjdHVyZT4gbV9u dW1iZXJGb3JtYXRTdHJ1Y3R1cmU7CiAgICAgTGF6eVByb3BlcnR5PEpTR2xvYmFsT2JqZWN0LCBT dHJ1Y3R1cmU+IG1fZGF0ZVRpbWVGb3JtYXRTdHJ1Y3R1cmU7CkBAIC02MDYsNyArNjA2LDcgQEAg Y2xhc3MgSlNHbG9iYWxPYmplY3QgOiBwdWJsaWMgSlNTZWdtZW50ZWRWYXJpYWJsZU9iamVjdCB7 CiAgICAgSlNJbnRlcm5hbFByb21pc2VDb25zdHJ1Y3RvciogaW50ZXJuYWxQcm9taXNlQ29uc3Ry dWN0b3IoKSBjb25zdCB7IHJldHVybiBtX2ludGVybmFsUHJvbWlzZUNvbnN0cnVjdG9yLmdldCgp OyB9CiAKICNpZiBFTkFCTEUoSU5UTCkKLSAgICBJbnRsQ29sbGF0b3IqIGRlZmF1bHRDb2xsYXRv cihKU0dsb2JhbE9iamVjdCopOworICAgIEludGxDb2xsYXRvciogZGVmYXVsdENvbGxhdG9yKCkg Y29uc3QgeyByZXR1cm4gbV9kZWZhdWx0Q29sbGF0b3IuZ2V0KHRoaXMpOyB9CiAjZW5kaWYKIAog ICAgIE51bGxHZXR0ZXJGdW5jdGlvbiogbnVsbEdldHRlckZ1bmN0aW9uKCkgY29uc3QgeyByZXR1 cm4gbV9udWxsR2V0dGVyRnVuY3Rpb24uZ2V0KCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCmluZGV4IGY0YmE2MzIwMDYyZjZmOTFm YTRlZjlkNDBlZGFjNTJkNjVlZTI4NTEuLmVkN2Y1YzhjZjk5MmI2NjVlNDI0ZDA3YWE5NDlkYTcx MmFkZjBhOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmlu Z1Byb3RvdHlwZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5n UHJvdG90eXBlLmNwcApAQCAtMTUwMywxMCArMTUwMyw5IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwgc3RyaW5nUHJvdG9GdW5jTG9jYWxlQ29tcGFyZShKU0dsb2JhbE9iamVjdCogZ2xv YmFsCiAgICAgSlNWYWx1ZSBsb2NhbGVzID0gY2FsbEZyYW1lLT5hcmd1bWVudCgxKTsKICAgICBK U1ZhbHVlIG9wdGlvbnMgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDIpOwogICAgIEludGxDb2xsYXRv ciogY29sbGF0b3IgPSBudWxscHRyOwotICAgIGlmIChsb2NhbGVzLmlzVW5kZWZpbmVkKCkgJiYg b3B0aW9ucy5pc1VuZGVmaW5lZCgpKSB7Ci0gICAgICAgIGNvbGxhdG9yID0gZ2xvYmFsT2JqZWN0 LT5kZWZhdWx0Q29sbGF0b3IoZ2xvYmFsT2JqZWN0KTsKLSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7Ci0gICAgfSBlbHNlIHsKKyAgICBpZiAobG9j YWxlcy5pc1VuZGVmaW5lZCgpICYmIG9wdGlvbnMuaXNVbmRlZmluZWQoKSkKKyAgICAgICAgY29s bGF0b3IgPSBnbG9iYWxPYmplY3QtPmRlZmF1bHRDb2xsYXRvcigpOworICAgIGVsc2UgewogICAg ICAgICBjb2xsYXRvciA9IEludGxDb2xsYXRvcjo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QtPmNv bGxhdG9yU3RydWN0dXJlKCkpOwogICAgICAgICBjb2xsYXRvci0+aW5pdGlhbGl6ZUNvbGxhdG9y KGdsb2JhbE9iamVjdCwgbG9jYWxlcywgb3B0aW9ucyk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOwo=