214231 2020-07-11 23:51:13 -0700 [JSC] Avoid JSString creation in Intl.Locale#{minimize,maximize} 2020-07-12 13:29:05 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki darin ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1670834 0 ysuzuki 2020-07-11 23:51:13 -0700 [JSC] Avoid JSString creation in Intl.Locale#{minimize,maximize} 1670835 1 404088 ysuzuki 2020-07-11 23:51:56 -0700 Created attachment 404088 Patch 1670836 2 404089 ysuzuki 2020-07-12 00:02:19 -0700 Created attachment 404089 Patch 1670906 3 404089 ysuzuki 2020-07-12 13:07:43 -0700 Comment on attachment 404089 Patch Thanks! 1670907 4 ews-feeder 2020-07-12 13:14:04 -0700 Committed r264285: <https://trac.webkit.org/changeset/264285> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404089. 1670908 5 webkit-bug-importer 2020-07-12 13:15:19 -0700 <rdar://problem/65441234> 1670909 6 404089 darin 2020-07-12 13:21:30 -0700 Comment on attachment 404089 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404089&action=review > Source/JavaScriptCore/runtime/IntlLocale.cpp:221 > String tag = tagValue.inherits<IntlLocale>(vm) ? jsCast<IntlLocale*>(tagValue)->toString() : tagValue.toWTFString(globalObject); Is calling IntlLocale::toString better than just calling toWTFString on the tag value? Is the special case here important for correctness? Performance? 1670910 7 404089 ysuzuki 2020-07-12 13:29:05 -0700 Comment on attachment 404089 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404089&action=review >> Source/JavaScriptCore/runtime/IntlLocale.cpp:221 >> String tag = tagValue.inherits<IntlLocale>(vm) ? jsCast<IntlLocale*>(tagValue)->toString() : tagValue.toWTFString(globalObject); > > Is calling IntlLocale::toString better than just calling toWTFString on the tag value? Is the special case here important for correctness? Performance? This is important for correctness, and also improves the performance. According to the spec, here is special case. https://tc39.es/ecma402/#sec-Intl.Locale 8. If Type(tag) is Object and tag has an [[InitializedLocale]] internal slot, then 8.a Let tag be tag.[[Locale]]. This means that even if the given locale object has its own `toString` user defined method, initializeLocale should ignore calling this function and instead retrieve toString result from Locale's field directly. And it also improves the performance since we do not need to invoke `toString` JS function here. 404088 2020-07-11 23:51:56 -0700 2020-07-12 00:02:17 -0700 Patch bug-214231-20200711235155.patch text/plain 3819 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0Mjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz NjhlYTg4NjliM2Y1NGQxYmE5MTBhOWQ2OWEyN2U2NTgxZjY3MmY1Li5hMzMzMDkwMzc1Mjc3MGVi MDMwYTMzZjBlNDFlYTNjNTc5MDFkN2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wNy0xMSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIEF2b2lkIEpTU3RyaW5nIGNyZWF0aW9uIGluIEludGwuTG9jYWxl I3ttaW5pbWl6ZSxtYXhpbWl6ZX0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNDIzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBpbml0aWFsaXplTG9jYWxlIGZ1bmN0aW9uIHRha2luZyBTdHJpbmcg dG8gYXZvaWQgdW5uZWNlc3NhcnkgSlNTdHJpbmcgY3JlYXRpb24KKyAgICAgICAgaW4gSW50bC5M b2NhbGUje21heGltaXplLG1pbmltaXplfS4KKworICAgICAgICAqIHJ1bnRpbWUvSW50bExvY2Fs ZS5jcHA6CisgICAgICAgIChKU0M6OkludGxMb2NhbGU6OmluaXRpYWxpemVMb2NhbGUpOgorICAg ICAgICAqIHJ1bnRpbWUvSW50bExvY2FsZS5oOgorICAgICAgICAqIHJ1bnRpbWUvSW50bExvY2Fs ZVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OkludGxMb2NhbGVQcm90b3R5cGVGdW5jTWF4 aW1pemUpOgorICAgICAgICAoSlNDOjpJbnRsTG9jYWxlUHJvdG90eXBlRnVuY01pbmltaXplKToK KwogMjAyMC0wNy0xMSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAg ICAgIEludGwuTG9jYWxlIG1heGltaXplLCBtaW5pbWl6ZSBzaG91bGQgcmV0dXJuIEludGwuTG9j YWxlIGluc3RlYWQgb2YgU3RyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9JbnRsTG9jYWxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0lu dGxMb2NhbGUuY3BwCmluZGV4IGU3ZWE0OTg0NDg0MDk5NjM2YWE2Nzc5NWQ2YzIzOGY2YWVmZGFl ZTcuLjkxZGIzNDc1NGQ1ZjAwZGM0MGMyYWY4ZmMzN2Y5NzdhN2RmMmViOGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuY3BwCkBAIC0yMjAsNiArMjIwLDE0 IEBAIHZvaWQgSW50bExvY2FsZTo6aW5pdGlhbGl6ZUxvY2FsZShKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBKU1ZhbHVlIHRhZ1ZhbHVlCiAKICAgICBTdHJpbmcgdGFnID0gdGFnVmFsdWUu aW5oZXJpdHM8SW50bExvY2FsZT4odm0pID8ganNDYXN0PEludGxMb2NhbGUqPih0YWdWYWx1ZSkt PnRvU3RyaW5nKCkgOiB0YWdWYWx1ZS50b1dURlN0cmluZyhnbG9iYWxPYmplY3QpOwogICAgIFJF VFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CisgICAgaW5pdGlhbGl6ZUxvY2FsZShn bG9iYWxPYmplY3QsIHRhZywgb3B0aW9uc1ZhbHVlKTsKK30KKworLy8gaHR0cHM6Ly90YzM5LmVz L2VjbWE0MDIvI3NlYy1JbnRsLkxvY2FsZQordm9pZCBJbnRsTG9jYWxlOjppbml0aWFsaXplTG9j YWxlKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFN0cmluZyB0YWcsIEpTVmFsdWUgb3B0 aW9uc1ZhbHVlKQoreworICAgIFZNJiB2bSA9IGdsb2JhbE9iamVjdC0+dm0oKTsKKyAgICBhdXRv IHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAKICAgICBKU1ZhbHVlIG9wdGlvbnMg PSBvcHRpb25zVmFsdWU7CiAgICAgaWYgKCFvcHRpb25zVmFsdWUuaXNVbmRlZmluZWQoKSkgewpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZS5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZS5oCmluZGV4IGFiZGViMzUz NDgyMmY4ZWZiMTEzODdhNjVhMTdjYmNiOWViNzhkYjMuLmZmNTBlN2Y3NmE1MGE5YTNmMjc3OTYx NmQwYTkyYjU3NzRiZjE1YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0ludGxMb2NhbGUuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRs TG9jYWxlLmgKQEAgLTUxLDYgKzUxLDcgQEAgY2xhc3MgSW50bExvY2FsZSBmaW5hbCA6IHB1Ymxp YyBKU05vbkZpbmFsT2JqZWN0IHsKIAogICAgIERFQ0xBUkVfSU5GTzsKIAorICAgIHZvaWQgaW5p dGlhbGl6ZUxvY2FsZShKU0dsb2JhbE9iamVjdCosIGNvbnN0IFN0cmluZyYgdGFnLCBKU1ZhbHVl IG9wdGlvbnNWYWx1ZSk7CiAgICAgdm9pZCBpbml0aWFsaXplTG9jYWxlKEpTR2xvYmFsT2JqZWN0 KiwgSlNWYWx1ZSB0YWdWYWx1ZSwgSlNWYWx1ZSBvcHRpb25zVmFsdWUpOwogICAgIGNvbnN0IFN0 cmluZyYgbWF4aW1hbCgpOwogICAgIGNvbnN0IFN0cmluZyYgbWluaW1hbCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZVByb3RvdHlwZS5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsTG9jYWxlUHJvdG90eXBlLmNwcApp bmRleCBlOGJkYmRlODY3YjQ4ODk5Y2U2OTIzNTU5NTYyZThiOGI1ZDJiZmRhLi40YThiODQzOThl YjA4NWIxNjYwNGZlNDE0OWJlMTU2ODg2ZGQ3OThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9JbnRsTG9jYWxlUHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9JbnRsTG9jYWxlUHJvdG90eXBlLmNwcApAQCAtMTA3LDcgKzEw Nyw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSW50bExvY2FsZVByb3RvdHlwZUZ1 bmNNYXhpbWl6ZShKU0dsb2JhbE9iamVjdCogZ2xvCiAKICAgICBJbnRsTG9jYWxlKiBuZXdMb2Nh bGUgPSBJbnRsTG9jYWxlOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdC0+bG9jYWxlU3RydWN0dXJl KCkpOwogICAgIHNjb3BlLnJlbGVhc2UoKTsKLSAgICBuZXdMb2NhbGUtPmluaXRpYWxpemVMb2Nh bGUoZ2xvYmFsT2JqZWN0LCBqc1N0cmluZyh2bSwgbG9jYWxlLT5tYXhpbWFsKCkpLCBqc1VuZGVm aW5lZCgpKTsKKyAgICBuZXdMb2NhbGUtPmluaXRpYWxpemVMb2NhbGUoZ2xvYmFsT2JqZWN0LCBs b2NhbGUtPm1heGltYWwoKSwganNVbmRlZmluZWQoKSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVu Y29kZShuZXdMb2NhbGUpOwogfQogCkBAIC0xMjMsNyArMTIzLDcgQEAgRW5jb2RlZEpTVmFsdWUg SlNDX0hPU1RfQ0FMTCBJbnRsTG9jYWxlUHJvdG90eXBlRnVuY01pbmltaXplKEpTR2xvYmFsT2Jq ZWN0KiBnbG8KIAogICAgIEludGxMb2NhbGUqIG5ld0xvY2FsZSA9IEludGxMb2NhbGU6OmNyZWF0 ZSh2bSwgZ2xvYmFsT2JqZWN0LT5sb2NhbGVTdHJ1Y3R1cmUoKSk7CiAgICAgc2NvcGUucmVsZWFz ZSgpOwotICAgIG5ld0xvY2FsZS0+aW5pdGlhbGl6ZUxvY2FsZShnbG9iYWxPYmplY3QsIGpzU3Ry aW5nKHZtLCBsb2NhbGUtPm1pbmltYWwoKSksIGpzVW5kZWZpbmVkKCkpOworICAgIG5ld0xvY2Fs ZS0+aW5pdGlhbGl6ZUxvY2FsZShnbG9iYWxPYmplY3QsIGxvY2FsZS0+bWluaW1hbCgpLCBqc1Vu ZGVmaW5lZCgpKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKG5ld0xvY2FsZSk7CiB9CiAK 404089 2020-07-12 00:02:19 -0700 2020-07-12 13:14:04 -0700 Patch bug-214231-20200712000218.patch text/plain 3826 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0Mjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz NjhlYTg4NjliM2Y1NGQxYmE5MTBhOWQ2OWEyN2U2NTgxZjY3MmY1Li5hMDljMTc4YTk4OTAzYmY3 ZDdjNzIzNjZiMzA2YTY0ZTY5YWY2YzYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wNy0xMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIEF2b2lkIEpTU3RyaW5nIGNyZWF0aW9uIGluIEludGwuTG9jYWxl I3ttaW5pbWl6ZSxtYXhpbWl6ZX0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNDIzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBpbml0aWFsaXplTG9jYWxlIGZ1bmN0aW9uIHRha2luZyBTdHJpbmcg dG8gYXZvaWQgdW5uZWNlc3NhcnkgSlNTdHJpbmcgY3JlYXRpb24KKyAgICAgICAgaW4gSW50bC5M b2NhbGUje21heGltaXplLG1pbmltaXplfS4KKworICAgICAgICAqIHJ1bnRpbWUvSW50bExvY2Fs ZS5jcHA6CisgICAgICAgIChKU0M6OkludGxMb2NhbGU6OmluaXRpYWxpemVMb2NhbGUpOgorICAg ICAgICAqIHJ1bnRpbWUvSW50bExvY2FsZS5oOgorICAgICAgICAqIHJ1bnRpbWUvSW50bExvY2Fs ZVByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OkludGxMb2NhbGVQcm90b3R5cGVGdW5jTWF4 aW1pemUpOgorICAgICAgICAoSlNDOjpJbnRsTG9jYWxlUHJvdG90eXBlRnVuY01pbmltaXplKToK KwogMjAyMC0wNy0xMSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAg ICAgIEludGwuTG9jYWxlIG1heGltaXplLCBtaW5pbWl6ZSBzaG91bGQgcmV0dXJuIEludGwuTG9j YWxlIGluc3RlYWQgb2YgU3RyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9JbnRsTG9jYWxlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0lu dGxMb2NhbGUuY3BwCmluZGV4IGU3ZWE0OTg0NDg0MDk5NjM2YWE2Nzc5NWQ2YzIzOGY2YWVmZGFl ZTcuLmJjM2QwMDc3ZGUxNjNkMjAxYjgzZjQwMGFhN2MzM2VlY2QyMDhjYjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuY3BwCkBAIC0yMjAsNiArMjIwLDE0 IEBAIHZvaWQgSW50bExvY2FsZTo6aW5pdGlhbGl6ZUxvY2FsZShKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBKU1ZhbHVlIHRhZ1ZhbHVlCiAKICAgICBTdHJpbmcgdGFnID0gdGFnVmFsdWUu aW5oZXJpdHM8SW50bExvY2FsZT4odm0pID8ganNDYXN0PEludGxMb2NhbGUqPih0YWdWYWx1ZSkt PnRvU3RyaW5nKCkgOiB0YWdWYWx1ZS50b1dURlN0cmluZyhnbG9iYWxPYmplY3QpOwogICAgIFJF VFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CisgICAgaW5pdGlhbGl6ZUxvY2FsZShn bG9iYWxPYmplY3QsIHRhZywgb3B0aW9uc1ZhbHVlKTsKK30KKworLy8gaHR0cHM6Ly90YzM5LmVz L2VjbWE0MDIvI3NlYy1JbnRsLkxvY2FsZQordm9pZCBJbnRsTG9jYWxlOjppbml0aWFsaXplTG9j YWxlKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIGNvbnN0IFN0cmluZyYgdGFnLCBKU1Zh bHVlIG9wdGlvbnNWYWx1ZSkKK3sKKyAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZtKCk7Cisg ICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCiAgICAgSlNWYWx1ZSBv cHRpb25zID0gb3B0aW9uc1ZhbHVlOwogICAgIGlmICghb3B0aW9uc1ZhbHVlLmlzVW5kZWZpbmVk KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2Nh bGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuaAppbmRleCBh YmRlYjM1MzQ4MjJmOGVmYjExMzg3YTY1YTE3Y2JjYjllYjc4ZGIzLi5mZjUwZTdmNzZhNTBhOWEz ZjI3Nzk2MTZkMGE5MmI1Nzc0YmYxNWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9JbnRsTG9jYWxlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSW50bExvY2FsZS5oCkBAIC01MSw2ICs1MSw3IEBAIGNsYXNzIEludGxMb2NhbGUgZmluYWwg OiBwdWJsaWMgSlNOb25GaW5hbE9iamVjdCB7CiAKICAgICBERUNMQVJFX0lORk87CiAKKyAgICB2 b2lkIGluaXRpYWxpemVMb2NhbGUoSlNHbG9iYWxPYmplY3QqLCBjb25zdCBTdHJpbmcmIHRhZywg SlNWYWx1ZSBvcHRpb25zVmFsdWUpOwogICAgIHZvaWQgaW5pdGlhbGl6ZUxvY2FsZShKU0dsb2Jh bE9iamVjdCosIEpTVmFsdWUgdGFnVmFsdWUsIEpTVmFsdWUgb3B0aW9uc1ZhbHVlKTsKICAgICBj b25zdCBTdHJpbmcmIG1heGltYWwoKTsKICAgICBjb25zdCBTdHJpbmcmIG1pbmltYWwoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGVQcm90b3R5 cGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZVByb3RvdHlw ZS5jcHAKaW5kZXggZThiZGJkZTg2N2I0ODg5OWNlNjkyMzU1OTU2MmU4YjhiNWQyYmZkYS4uNGE4 Yjg0Mzk4ZWIwODViMTY2MDRmZTQxNDliZTE1Njg4NmRkNzk4ZCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZVByb3RvdHlwZS5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZVByb3RvdHlwZS5jcHAKQEAgLTEw Nyw3ICsxMDcsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIEludGxMb2NhbGVQcm90 b3R5cGVGdW5jTWF4aW1pemUoSlNHbG9iYWxPYmplY3QqIGdsbwogCiAgICAgSW50bExvY2FsZSog bmV3TG9jYWxlID0gSW50bExvY2FsZTo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QtPmxvY2FsZVN0 cnVjdHVyZSgpKTsKICAgICBzY29wZS5yZWxlYXNlKCk7Ci0gICAgbmV3TG9jYWxlLT5pbml0aWFs aXplTG9jYWxlKGdsb2JhbE9iamVjdCwganNTdHJpbmcodm0sIGxvY2FsZS0+bWF4aW1hbCgpKSwg anNVbmRlZmluZWQoKSk7CisgICAgbmV3TG9jYWxlLT5pbml0aWFsaXplTG9jYWxlKGdsb2JhbE9i amVjdCwgbG9jYWxlLT5tYXhpbWFsKCksIGpzVW5kZWZpbmVkKCkpOwogICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUobmV3TG9jYWxlKTsKIH0KIApAQCAtMTIzLDcgKzEyMyw3IEBAIEVuY29kZWRK U1ZhbHVlIEpTQ19IT1NUX0NBTEwgSW50bExvY2FsZVByb3RvdHlwZUZ1bmNNaW5pbWl6ZShKU0ds b2JhbE9iamVjdCogZ2xvCiAKICAgICBJbnRsTG9jYWxlKiBuZXdMb2NhbGUgPSBJbnRsTG9jYWxl OjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdC0+bG9jYWxlU3RydWN0dXJlKCkpOwogICAgIHNjb3Bl LnJlbGVhc2UoKTsKLSAgICBuZXdMb2NhbGUtPmluaXRpYWxpemVMb2NhbGUoZ2xvYmFsT2JqZWN0 LCBqc1N0cmluZyh2bSwgbG9jYWxlLT5taW5pbWFsKCkpLCBqc1VuZGVmaW5lZCgpKTsKKyAgICBu ZXdMb2NhbGUtPmluaXRpYWxpemVMb2NhbGUoZ2xvYmFsT2JqZWN0LCBsb2NhbGUtPm1pbmltYWwo KSwganNVbmRlZmluZWQoKSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShuZXdMb2NhbGUp OwogfQogCg==