227508 2021-06-29 15:10:54 -0700 Remove unnecessary canBeInternal invocations to mitigate the cost of potential unmatched patterns in B3LowerToAir 2021-07-01 11:25:31 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 yijia_huang yijia_huang ews-watchlist fpizlo keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1773577 0 yijia_huang 2021-06-29 15:10:54 -0700 ... 1774133 1 432701 yijia_huang 2021-07-01 08:54:20 -0700 Created attachment 432701 Patch 1774138 2 432701 keith_miller 2021-07-01 09:02:55 -0700 Comment on attachment 432701 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=432701&action=review > Source/JavaScriptCore/ChangeLog:10 > + The bit pattern doesn't cause the worst code generation in the all-internals-are-captured > + case. So, they don't need canBeInternal checks which might terminate potential matched > + scenarios. Nit: doesn't cause the worst => doesn't cause worse. 1774139 3 432703 yijia_huang 2021-07-01 09:07:19 -0700 Created attachment 432703 Patch 1774180 4 ews-feeder 2021-07-01 11:24:17 -0700 Committed r279473 (239327@main): <https://commits.webkit.org/239327@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432703. 1774181 5 webkit-bug-importer 2021-07-01 11:25:31 -0700 <rdar://problem/80035749> 432701 2021-07-01 08:54:20 -0700 2021-07-01 09:07:16 -0700 Patch bug-227508-20210701105419.patch text/plain 9148 yijia_huang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 M2MxYzMxOWY5ZjYyNTM2N2I5Mzc2N2U0N2U0M2FiYTc1M2ZhZTM1Li4yYmZhMjQ0NTU0M2Q0NDU2 NmQyZWI1NmUzMTkyZTIyZTE3ZmY0YmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAyMS0wNi0zMCAgWWlqaWEgSHVhbmcgIDx5aWppYV9odWFuZ0BhcHBsZS5j b20+CisKKyAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5IGNhbkJlSW50ZXJuYWwgaW52b2NhdGlv bnMgdG8gbWl0aWdhdGUgdGhlIGNvc3Qgb2YgcG90ZW50aWFsIHVubWF0Y2hlZCBwYXR0ZXJucyBp biBCM0xvd2VyVG9BaXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNzUwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBiaXQgcGF0dGVybiBkb2Vzbid0IGNhdXNlIHRoZSB3b3JzdCBjb2RlIGdlbmVy YXRpb24gaW4gdGhlIGFsbC1pbnRlcm5hbHMtYXJlLWNhcHR1cmVkIAorICAgICAgICBjYXNlLiBT bywgdGhleSBkb24ndCBuZWVkIGNhbkJlSW50ZXJuYWwgY2hlY2tzIHdoaWNoIG1pZ2h0IHRlcm1p bmF0ZSBwb3RlbnRpYWwgbWF0Y2hlZCAKKyAgICAgICAgc2NlbmFyaW9zLgorCisgICAgICAgIFRo ZSBlcXVpdmFsZW50IHBhdHRlcm4gb2YgU0JGSVogaXMgKChzcmMgPDwgYW1vdW50KSA+PiBhbW91 bnQpIDw8IGxzYi4gR2l2ZW4gdGhlIGNvZGU6CisKKyAgICAgICAgYSA9IHggPDwgQworICAgICAg ICBiID0gYSA+PiBDCisgICAgICAgIGMgPSBiIDw8IEQKKworICAgICAgICBwcmludChhKQorICAg ICAgICBwcmludChiKQorICAgICAgICBwcmludChjKQorCisgICAgICAgIFRoZSBwYXR0ZXJuIHdv bid0IG1hdGNoIGJlY2F1c2Ugb2YgIWNhbkJlSW50ZXJuYWwgZm9yIGEgYW5kIGIgKHVzZUNvdW50 cyA+IDEpLiAKKyAgICAgICAgU28sIHRoaXMgd291bGQgZW1pdCB0aHJlZSBzZXBhcmF0ZSBpbnN0 cnVjdGlvbnMuIEJ1dCBpZiB3ZSByZW1vdmVkIGNhbkJlSW50ZXJuYWwsIAorICAgICAgICBpdCB3 b3VsZCBzdGlsbCBiZSBqdXN0IHRocmVlIHNlcGFyYXRlIGluc3RydWN0aW9ucywgYW5kIHRoZXkg d291bGRuJ3QgYmUgYW55IG1vcmUgCisgICAgICAgIGV4cGVuc2l2ZS4gU3VwcG9zZSB0aGUgcHJp bnQoYikgaXMgcmVtb3ZlZCwgYWJvdmUuIFRoZW4sIHdpdGggdGhlIGNhbkJlSW50ZXJuYWwgY2hl Y2ssIAorICAgICAgICBpdCBpcyBlbWl0dGluZyB0aHJlZSBpbnN0cnVjdGlvbnMuIFdpdGhvdXQg dGhlIGNhbkJlSW50ZXJuYWwgY2hlY2ssIGl0IHdvdWxkIGVtaXQgb25seSAKKyAgICAgICAgdHdv ICh4IDw8IEMgYW5kIFNCRklaIHRvIGNvbXB1dGUgYykuIEFuZCB0aGF0IHdvdWxkIGJlIGxlc3Mg ZXhwZW5zaXZlLgorCisgICAgICAgICogYjMvQjNMb3dlclRvQWlyLmNwcDoKKwogMjAyMS0wNi0z MCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIFN0 b3AgZ2VuZXJhdGluZyBkZWZhdWx0IHBhcmFtZXRlciBjb2RlIGlmIGNsYXNzIGNvbnN0cnVjdG9y IGlzIGNhbGxlZCB3aXRob3V0ICduZXcnCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYjMvQjNMb3dlclRvQWlyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM0xvd2Vy VG9BaXIuY3BwCmluZGV4IDAwMTRkNTA0MTFiZGVkMDc5MjljNjA1MzkyZTdjMDNiNGI1YjA3OTEu LmIzMzA4ZjNmZjIwMThmNWE5MWU3NTEyMWI4YjA1OWI5NjE1YjYyNGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9iMy9CM0xvd2VyVG9BaXIuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9iMy9CM0xvd2VyVG9BaXIuY3BwCkBAIC0yNzY5LDcgKzI3NjksNyBAQCBwcml2 YXRlOgogICAgICAgICAgICAgICAgIEFpcjo6T3Bjb2RlIG9wY29kZSA9IG9wY29kZUZvclR5cGUo RXh0cmFjdFVuc2lnbmVkQml0ZmllbGQzMiwgRXh0cmFjdFVuc2lnbmVkQml0ZmllbGQ2NCwgbV92 YWx1ZS0+dHlwZSgpKTsKICAgICAgICAgICAgICAgICBpZiAoIWlzVmFsaWRGb3JtKG9wY29kZSwg QXJnOjpUbXAsIEFyZzo6SW1tLCBBcmc6OkltbSwgQXJnOjpUbXApKSAKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgICAgIGlmIChsZWZ0LT5vcGNvZGUoKSAh PSBaU2hyIHx8ICFjYW5CZUludGVybmFsKGxlZnQpKQorICAgICAgICAgICAgICAgIGlmIChsZWZ0 LT5vcGNvZGUoKSAhPSBaU2hyKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICAgICAgICAgICAgICBWYWx1ZSogc3JjVmFsdWUgPSBsZWZ0LT5jaGlsZCgwKTsKQEAgLTI3 ODcsNyArMjc4Nyw2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgICAgICAgICAgICAgIGFwcGVuZChvcGNvZGUsIHRtcChzcmNWYWx1ZSksIGltbShs c2JWYWx1ZSksIGltbSh3aWR0aCksIHRtcChtX3ZhbHVlKSk7Ci0gICAgICAgICAgICAgICAgY29t bWl0SW50ZXJuYWwobGVmdCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAg ICAgICB9OwogCkBAIC0yNzk5LDcgKzI3OTgsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAg IEFpcjo6T3Bjb2RlIG9wY29kZSA9IG9wY29kZUZvclR5cGUoQ2xlYXJCaXRzV2l0aE1hc2szMiwg Q2xlYXJCaXRzV2l0aE1hc2s2NCwgbV92YWx1ZS0+dHlwZSgpKTsKICAgICAgICAgICAgICAgICBp ZiAoIWlzVmFsaWRGb3JtKG9wY29kZSwgQXJnOjpUbXAsIEFyZzo6VG1wLCBBcmc6OlRtcCkpIAog ICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKHJp Z2h0LT5vcGNvZGUoKSAhPSBCaXRYb3IgfHwgIWNhbkJlSW50ZXJuYWwocmlnaHQpKQorICAgICAg ICAgICAgICAgIGlmIChyaWdodC0+b3Bjb2RlKCkgIT0gQml0WG9yKQogICAgICAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBWYWx1ZSogblZhbHVlID0gbGVm dDsKQEAgLTI4MDksNyArMjgwOCw2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAgIGFwcGVuZChvcGNvZGUsIHRtcChuVmFsdWUp LCB0bXAobVZhbHVlKSwgdG1wKG1fdmFsdWUpKTsKLSAgICAgICAgICAgICAgICBjb21taXRJbnRl cm5hbChyaWdodCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9 OwogCkBAIC0yODMzLDExICsyODMxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBBaXI6 Ok9wY29kZSBvcGNvZGUgPSBvcGNvZGVGb3JUeXBlKEluc2VydEJpdEZpZWxkMzIsIEluc2VydEJp dEZpZWxkNjQsIG1fdmFsdWUtPnR5cGUoKSk7CiAgICAgICAgICAgICAgICAgaWYgKCFpc1ZhbGlk Rm9ybShvcGNvZGUsIEFyZzo6VG1wLCBBcmc6OkltbSwgQXJnOjpJbW0sIEFyZzo6VG1wKSkgCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAobGVm dC0+b3Bjb2RlKCkgIT0gU2hsIHx8ICFjYW5CZUludGVybmFsKGxlZnQpKQotICAgICAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKHJpZ2h0LT5vcGNvZGUo KSAhPSBCaXRBbmQgfHwgIWNhbkJlSW50ZXJuYWwocmlnaHQpKQotICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKGxlZnQtPmNoaWxkKDApLT5vcGNv ZGUoKSAhPSBCaXRBbmQgfHwgIWNhbkJlSW50ZXJuYWwobGVmdC0+Y2hpbGQoMCkpKQorICAgICAg ICAgICAgICAgIGlmIChsZWZ0LT5vcGNvZGUoKSAhPSBTaGwgfHwgcmlnaHQtPm9wY29kZSgpICE9 IEJpdEFuZCB8fCBsZWZ0LT5jaGlsZCgwKS0+b3Bjb2RlKCkgIT0gQml0QW5kKQogICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBWYWx1ZSogblZhbHVl ID0gbGVmdC0+Y2hpbGQoMCktPmNoaWxkKDApOwpAQCAtMjg3NCw5ICsyODY4LDYgQEAgcHJpdmF0 ZToKICAgICAgICAgICAgICAgICBUbXAgcmVzdWx0ID0gdG1wKG1fdmFsdWUpOwogICAgICAgICAg ICAgICAgIGFwcGVuZChyZWxheGVkTW92ZUZvclR5cGUobV92YWx1ZS0+dHlwZSgpKSwgdG1wKGRW YWx1ZSksIHJlc3VsdCk7CiAgICAgICAgICAgICAgICAgYXBwZW5kKG9wY29kZSwgdG1wKG5WYWx1 ZSksIGltbShsc2JWYWx1ZSksIGltbSh3aWR0aCksIHJlc3VsdCk7Ci0gICAgICAgICAgICAgICAg Y29tbWl0SW50ZXJuYWwobGVmdC0+Y2hpbGQoMCkpOwotICAgICAgICAgICAgICAgIGNvbW1pdElu dGVybmFsKGxlZnQpOwotICAgICAgICAgICAgICAgIGNvbW1pdEludGVybmFsKHJpZ2h0KTsKICAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH07CiAKQEAgLTI4OTAsMTEg KzI4ODEsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEFpcjo6T3Bjb2RlIG9wY29kZSA9 IG9wY29kZUZvclR5cGUoRXh0cmFjdEluc2VydEJpdGZpZWxkQXRMb3dFbmQzMiwgRXh0cmFjdElu c2VydEJpdGZpZWxkQXRMb3dFbmQ2NCwgbV92YWx1ZS0+dHlwZSgpKTsKICAgICAgICAgICAgICAg ICBpZiAoIWlzVmFsaWRGb3JtKG9wY29kZSwgQXJnOjpUbXAsIEFyZzo6SW1tLCBBcmc6OkltbSwg QXJnOjpUbXApKSAKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAg ICAgICAgIGlmIChsZWZ0LT5vcGNvZGUoKSAhPSBCaXRBbmQgfHwgIWNhbkJlSW50ZXJuYWwobGVm dCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBp ZiAobGVmdC0+Y2hpbGQoMCktPm9wY29kZSgpICE9IFpTaHIgfHwgIWNhbkJlSW50ZXJuYWwobGVm dC0+Y2hpbGQoMCkpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAg ICAgICAgICAgaWYgKHJpZ2h0LT5vcGNvZGUoKSAhPSBCaXRBbmQgfHwgIWNhbkJlSW50ZXJuYWwo cmlnaHQpKQorICAgICAgICAgICAgICAgIGlmIChsZWZ0LT5vcGNvZGUoKSAhPSBCaXRBbmQgfHwg bGVmdC0+Y2hpbGQoMCktPm9wY29kZSgpICE9IFpTaHIgfHwgcmlnaHQtPm9wY29kZSgpICE9IEJp dEFuZCkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAg ICAgVmFsdWUqIG5WYWx1ZSA9IGxlZnQtPmNoaWxkKDApLT5jaGlsZCgwKTsKQEAgLTI5MzAsOSAr MjkxNyw2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgVG1wIHJlc3VsdCA9IHRtcChtX3Zh bHVlKTsKICAgICAgICAgICAgICAgICBhcHBlbmQocmVsYXhlZE1vdmVGb3JUeXBlKG1fdmFsdWUt PnR5cGUoKSksIHRtcChkVmFsdWUpLCByZXN1bHQpOwogICAgICAgICAgICAgICAgIGFwcGVuZChv cGNvZGUsIHRtcChuVmFsdWUpLCBpbW0obHNiVmFsdWUpLCBpbW0od2lkdGgpLCByZXN1bHQpOwot ICAgICAgICAgICAgICAgIGNvbW1pdEludGVybmFsKGxlZnQtPmNoaWxkKDApKTsKLSAgICAgICAg ICAgICAgICBjb21taXRJbnRlcm5hbChsZWZ0KTsKLSAgICAgICAgICAgICAgICBjb21taXRJbnRl cm5hbChyaWdodCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9 OwogCkBAIC0yOTQ0LDcgKzI5MjgsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEFpcjo6 T3Bjb2RlIG9wY29kZSA9IG9wY29kZUZvclR5cGUoT3JOb3QzMiwgT3JOb3Q2NCwgbV92YWx1ZS0+ dHlwZSgpKTsKICAgICAgICAgICAgICAgICBpZiAoIWlzVmFsaWRGb3JtKG9wY29kZSwgQXJnOjpU bXAsIEFyZzo6VG1wLCBBcmc6OlRtcCkpIAogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgICAgICAgICAgICAgaWYgKHJpZ2h0LT5vcGNvZGUoKSAhPSBCaXRYb3IgfHwgIWNh bkJlSW50ZXJuYWwocmlnaHQpKQorICAgICAgICAgICAgICAgIGlmIChyaWdodC0+b3Bjb2RlKCkg IT0gQml0WG9yKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAg ICAgICAgICBWYWx1ZSogblZhbHVlID0gbGVmdDsKQEAgLTI5NTQsNyArMjkzOCw2IEBAIHByaXZh dGU6CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAg IGFwcGVuZChvcGNvZGUsIHRtcChuVmFsdWUpLCB0bXAobVZhbHVlKSwgdG1wKG1fdmFsdWUpKTsK LSAgICAgICAgICAgICAgICBjb21taXRJbnRlcm5hbChyaWdodCk7CiAgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9OwogCkBAIC0zMDA2LDcgKzI5ODksNyBAQCBwcml2 YXRlOgogICAgICAgICAgICAgICAgIEFpcjo6T3Bjb2RlIG9wY29kZSA9IG9wY29kZUZvclR5cGUo SW5zZXJ0VW5zaWduZWRCaXRmaWVsZEluWmVybzMyLCBJbnNlcnRVbnNpZ25lZEJpdGZpZWxkSW5a ZXJvNjQsIG1fdmFsdWUtPnR5cGUoKSk7CiAgICAgICAgICAgICAgICAgaWYgKCFpc1ZhbGlkRm9y bShvcGNvZGUsIEFyZzo6VG1wLCBBcmc6OkltbSwgQXJnOjpJbW0sIEFyZzo6VG1wKSkKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgICAgIGlmIChsZWZ0LT5v cGNvZGUoKSAhPSBCaXRBbmQgfHwgIWNhbkJlSW50ZXJuYWwobGVmdCkpCisgICAgICAgICAgICAg ICAgaWYgKGxlZnQtPm9wY29kZSgpICE9IEJpdEFuZCkKICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAgICAgVmFsdWUqIG5WYWx1ZSA9IGxlZnQtPmNoaWxk KDApOwpAQCAtMzAyNCw3ICszMDA3LDYgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAgICAgYXBwZW5kKG9wY29kZSwgdG1wKG5WYWx1 ZSksIGltbShyaWdodCksIGltbSh3aWR0aCksIHRtcChtX3ZhbHVlKSk7Ci0gICAgICAgICAgICAg ICAgY29tbWl0SW50ZXJuYWwobGVmdCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgICAgICB9OwogCkBAIC0zMDM5LDkgKzMwMjEsNyBAQCBwcml2YXRlOgogICAgICAgICAg ICAgICAgIEFpcjo6T3Bjb2RlIG9wY29kZSA9IG9wY29kZUZvclR5cGUoSW5zZXJ0U2lnbmVkQml0 ZmllbGRJblplcm8zMiwgSW5zZXJ0U2lnbmVkQml0ZmllbGRJblplcm82NCwgbV92YWx1ZS0+dHlw ZSgpKTsKICAgICAgICAgICAgICAgICBpZiAoIWlzVmFsaWRGb3JtKG9wY29kZSwgQXJnOjpUbXAs IEFyZzo6SW1tLCBBcmc6OkltbSwgQXJnOjpUbXApKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKGxlZnQtPm9wY29kZSgpICE9IFNTaHIgfHwg IWNhbkJlSW50ZXJuYWwobGVmdCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgICAgICAgICBpZiAobGVmdC0+Y2hpbGQoMCktPm9wY29kZSgpICE9IFNobCB8fCAh Y2FuQmVJbnRlcm5hbChsZWZ0LT5jaGlsZCgwKSkpCisgICAgICAgICAgICAgICAgaWYgKGxlZnQt Pm9wY29kZSgpICE9IFNTaHIgfHwgbGVmdC0+Y2hpbGQoMCktPm9wY29kZSgpICE9IFNobCkKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAgICAgVmFsdWUq IHNyY1ZhbHVlID0gbGVmdC0+Y2hpbGQoMCktPmNoaWxkKDApOwpAQCAtMzA2NCw4ICszMDQ0LDYg QEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAg ICAgICAgICAgYXBwZW5kKG9wY29kZSwgdG1wKHNyY1ZhbHVlKSwgaW1tKGxzYlZhbHVlKSwgaW1t KHdpZHRoKSwgdG1wKG1fdmFsdWUpKTsKLSAgICAgICAgICAgICAgICBjb21taXRJbnRlcm5hbChs ZWZ0LT5jaGlsZCgwKSk7Ci0gICAgICAgICAgICAgICAgY29tbWl0SW50ZXJuYWwobGVmdCk7CiAg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9OwogCkBAIC0zMDkxLDkg KzMwNjksNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEFpcjo6T3Bjb2RlIG9wY29kZSA9 IG9wY29kZUZvclR5cGUoRXh0cmFjdFNpZ25lZEJpdGZpZWxkMzIsIEV4dHJhY3RTaWduZWRCaXRm aWVsZDY0LCBtX3ZhbHVlLT50eXBlKCkpOwogICAgICAgICAgICAgICAgIGlmICghaXNWYWxpZEZv cm0ob3Bjb2RlLCBBcmc6OlRtcCwgQXJnOjpJbW0sIEFyZzo6SW1tLCBBcmc6OlRtcCkpCiAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAobGVmdC0+ b3Bjb2RlKCkgIT0gU2hsIHx8ICFjYW5CZUludGVybmFsKGxlZnQpKQotICAgICAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKChsZWZ0LT5jaGlsZCgwKS0+ b3Bjb2RlKCkgIT0gWlNociAmJiBsZWZ0LT5jaGlsZCgwKS0+b3Bjb2RlKCkgIT0gU1NocikgfHwg IWNhbkJlSW50ZXJuYWwobGVmdC0+Y2hpbGQoMCkpKQorICAgICAgICAgICAgICAgIGlmIChsZWZ0 LT5vcGNvZGUoKSAhPSBTaGwgfHwgKGxlZnQtPmNoaWxkKDApLT5vcGNvZGUoKSAhPSBaU2hyICYm IGxlZnQtPmNoaWxkKDApLT5vcGNvZGUoKSAhPSBTU2hyKSkKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAgICAgVmFsdWUqIHNyY1ZhbHVlID0gbGVmdC0+ Y2hpbGQoMCktPmNoaWxkKDApOwpAQCAtMzExNiw4ICszMDkyLDYgQEAgcHJpdmF0ZToKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAgICAgYXBwZW5kKG9w Y29kZSwgdG1wKHNyY1ZhbHVlKSwgaW1tKGxzYlZhbHVlKSwgaW1tKHdpZHRoKSwgdG1wKG1fdmFs dWUpKTsKLSAgICAgICAgICAgICAgICBjb21taXRJbnRlcm5hbChsZWZ0LT5jaGlsZCgwKSk7Ci0g ICAgICAgICAgICAgICAgY29tbWl0SW50ZXJuYWwobGVmdCk7CiAgICAgICAgICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgICAgICAgICB9OwogCg== 432703 2021-07-01 09:07:19 -0700 2021-07-01 11:24:18 -0700 Patch bug-227508-20210701110718.patch text/plain 9144 yijia_huang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 M2MxYzMxOWY5ZjYyNTM2N2I5Mzc2N2U0N2U0M2FiYTc1M2ZhZTM1Li4zMjI1YmU4NDQ3ZDcwYjEy NjBhMTZhMGM4NmI2NjdjNmFhM2I5OGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAyMS0wNi0zMCAgWWlqaWEgSHVhbmcgIDx5aWppYV9odWFuZ0BhcHBsZS5j b20+CisKKyAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5IGNhbkJlSW50ZXJuYWwgaW52b2NhdGlv bnMgdG8gbWl0aWdhdGUgdGhlIGNvc3Qgb2YgcG90ZW50aWFsIHVubWF0Y2hlZCBwYXR0ZXJucyBp biBCM0xvd2VyVG9BaXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNzUwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBiaXQgcGF0dGVybiBkb2Vzbid0IGNhdXNlIHdvcnNlIGNvZGUgZ2VuZXJhdGlv biBpbiB0aGUgYWxsLWludGVybmFscy1hcmUtY2FwdHVyZWQgCisgICAgICAgIGNhc2UuIFNvLCB0 aGV5IGRvbid0IG5lZWQgY2FuQmVJbnRlcm5hbCBjaGVja3Mgd2hpY2ggbWlnaHQgdGVybWluYXRl IHBvdGVudGlhbCBtYXRjaGVkIAorICAgICAgICBzY2VuYXJpb3MuCisKKyAgICAgICAgVGhlIGVx dWl2YWxlbnQgcGF0dGVybiBvZiBTQkZJWiBpcyAoKHNyYyA8PCBhbW91bnQpID4+IGFtb3VudCkg PDwgbHNiLiBHaXZlbiB0aGUgY29kZToKKworICAgICAgICBhID0geCA8PCBDCisgICAgICAgIGIg PSBhID4+IEMKKyAgICAgICAgYyA9IGIgPDwgRAorCisgICAgICAgIHByaW50KGEpCisgICAgICAg IHByaW50KGIpCisgICAgICAgIHByaW50KGMpCisKKyAgICAgICAgVGhlIHBhdHRlcm4gd29uJ3Qg bWF0Y2ggYmVjYXVzZSBvZiAhY2FuQmVJbnRlcm5hbCBmb3IgYSBhbmQgYiAodXNlQ291bnRzID4g MSkuIAorICAgICAgICBTbywgdGhpcyB3b3VsZCBlbWl0IHRocmVlIHNlcGFyYXRlIGluc3RydWN0 aW9ucy4gQnV0IGlmIHdlIHJlbW92ZWQgY2FuQmVJbnRlcm5hbCwgCisgICAgICAgIGl0IHdvdWxk IHN0aWxsIGJlIGp1c3QgdGhyZWUgc2VwYXJhdGUgaW5zdHJ1Y3Rpb25zLCBhbmQgdGhleSB3b3Vs ZG4ndCBiZSBhbnkgbW9yZSAKKyAgICAgICAgZXhwZW5zaXZlLiBTdXBwb3NlIHRoZSBwcmludChi KSBpcyByZW1vdmVkLCBhYm92ZS4gVGhlbiwgd2l0aCB0aGUgY2FuQmVJbnRlcm5hbCBjaGVjaywg CisgICAgICAgIGl0IGlzIGVtaXR0aW5nIHRocmVlIGluc3RydWN0aW9ucy4gV2l0aG91dCB0aGUg Y2FuQmVJbnRlcm5hbCBjaGVjaywgaXQgd291bGQgZW1pdCBvbmx5IAorICAgICAgICB0d28gKHgg PDwgQyBhbmQgU0JGSVogdG8gY29tcHV0ZSBjKS4gQW5kIHRoYXQgd291bGQgYmUgbGVzcyBleHBl bnNpdmUuCisKKyAgICAgICAgKiBiMy9CM0xvd2VyVG9BaXIuY3BwOgorCiAyMDIxLTA2LTMwICBZ dXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gU3RvcCBn ZW5lcmF0aW5nIGRlZmF1bHQgcGFyYW1ldGVyIGNvZGUgaWYgY2xhc3MgY29uc3RydWN0b3IgaXMg Y2FsbGVkIHdpdGhvdXQgJ25ldycKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i My9CM0xvd2VyVG9BaXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL0IzTG93ZXJUb0Fp ci5jcHAKaW5kZXggMDAxNGQ1MDQxMWJkZWQwNzkyOWM2MDUzOTJlN2MwM2I0YjViMDc5MS4uYjMz MDhmM2ZmMjAxOGY1YTkxZTc1MTIxYjhiMDU5Yjk2MTViNjI0YyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2IzL0IzTG93ZXJUb0Fpci5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2IzL0IzTG93ZXJUb0Fpci5jcHAKQEAgLTI3NjksNyArMjc2OSw3IEBAIHByaXZhdGU6 CiAgICAgICAgICAgICAgICAgQWlyOjpPcGNvZGUgb3Bjb2RlID0gb3Bjb2RlRm9yVHlwZShFeHRy YWN0VW5zaWduZWRCaXRmaWVsZDMyLCBFeHRyYWN0VW5zaWduZWRCaXRmaWVsZDY0LCBtX3ZhbHVl LT50eXBlKCkpOwogICAgICAgICAgICAgICAgIGlmICghaXNWYWxpZEZvcm0ob3Bjb2RlLCBBcmc6 OlRtcCwgQXJnOjpJbW0sIEFyZzo6SW1tLCBBcmc6OlRtcCkpIAogICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKGxlZnQtPm9wY29kZSgpICE9IFpT aHIgfHwgIWNhbkJlSW50ZXJuYWwobGVmdCkpCisgICAgICAgICAgICAgICAgaWYgKGxlZnQtPm9w Y29kZSgpICE9IFpTaHIpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg ICAgICAgICAgICAgIFZhbHVlKiBzcmNWYWx1ZSA9IGxlZnQtPmNoaWxkKDApOwpAQCAtMjc4Nyw3 ICsyNzg3LDYgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgICAgICAgICAgICAgYXBwZW5kKG9wY29kZSwgdG1wKHNyY1ZhbHVlKSwgaW1tKGxzYlZh bHVlKSwgaW1tKHdpZHRoKSwgdG1wKG1fdmFsdWUpKTsKLSAgICAgICAgICAgICAgICBjb21taXRJ bnRlcm5hbChsZWZ0KTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAg IH07CiAKQEAgLTI3OTksNyArMjc5OCw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgQWly OjpPcGNvZGUgb3Bjb2RlID0gb3Bjb2RlRm9yVHlwZShDbGVhckJpdHNXaXRoTWFzazMyLCBDbGVh ckJpdHNXaXRoTWFzazY0LCBtX3ZhbHVlLT50eXBlKCkpOwogICAgICAgICAgICAgICAgIGlmICgh aXNWYWxpZEZvcm0ob3Bjb2RlLCBBcmc6OlRtcCwgQXJnOjpUbXAsIEFyZzo6VG1wKSkgCiAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAocmlnaHQt Pm9wY29kZSgpICE9IEJpdFhvciB8fCAhY2FuQmVJbnRlcm5hbChyaWdodCkpCisgICAgICAgICAg ICAgICAgaWYgKHJpZ2h0LT5vcGNvZGUoKSAhPSBCaXRYb3IpCiAgICAgICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAgIFZhbHVlKiBuVmFsdWUgPSBsZWZ0OwpA QCAtMjgwOSw3ICsyODA4LDYgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgICAgICAgICAgICAgYXBwZW5kKG9wY29kZSwgdG1wKG5WYWx1ZSksIHRt cChtVmFsdWUpLCB0bXAobV92YWx1ZSkpOwotICAgICAgICAgICAgICAgIGNvbW1pdEludGVybmFs KHJpZ2h0KTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH07CiAK QEAgLTI4MzMsMTEgKzI4MzEsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIEFpcjo6T3Bj b2RlIG9wY29kZSA9IG9wY29kZUZvclR5cGUoSW5zZXJ0Qml0RmllbGQzMiwgSW5zZXJ0Qml0Rmll bGQ2NCwgbV92YWx1ZS0+dHlwZSgpKTsKICAgICAgICAgICAgICAgICBpZiAoIWlzVmFsaWRGb3Jt KG9wY29kZSwgQXJnOjpUbXAsIEFyZzo6SW1tLCBBcmc6OkltbSwgQXJnOjpUbXApKSAKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgICAgIGlmIChsZWZ0LT5v cGNvZGUoKSAhPSBTaGwgfHwgIWNhbkJlSW50ZXJuYWwobGVmdCkpCi0gICAgICAgICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAocmlnaHQtPm9wY29kZSgpICE9 IEJpdEFuZCB8fCAhY2FuQmVJbnRlcm5hbChyaWdodCkpCi0gICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAobGVmdC0+Y2hpbGQoMCktPm9wY29kZSgp ICE9IEJpdEFuZCB8fCAhY2FuQmVJbnRlcm5hbChsZWZ0LT5jaGlsZCgwKSkpCisgICAgICAgICAg ICAgICAgaWYgKGxlZnQtPm9wY29kZSgpICE9IFNobCB8fCByaWdodC0+b3Bjb2RlKCkgIT0gQml0 QW5kIHx8IGxlZnQtPmNoaWxkKDApLT5vcGNvZGUoKSAhPSBCaXRBbmQpCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAgIFZhbHVlKiBuVmFsdWUgPSBs ZWZ0LT5jaGlsZCgwKS0+Y2hpbGQoMCk7CkBAIC0yODc0LDkgKzI4NjgsNiBAQCBwcml2YXRlOgog ICAgICAgICAgICAgICAgIFRtcCByZXN1bHQgPSB0bXAobV92YWx1ZSk7CiAgICAgICAgICAgICAg ICAgYXBwZW5kKHJlbGF4ZWRNb3ZlRm9yVHlwZShtX3ZhbHVlLT50eXBlKCkpLCB0bXAoZFZhbHVl KSwgcmVzdWx0KTsKICAgICAgICAgICAgICAgICBhcHBlbmQob3Bjb2RlLCB0bXAoblZhbHVlKSwg aW1tKGxzYlZhbHVlKSwgaW1tKHdpZHRoKSwgcmVzdWx0KTsKLSAgICAgICAgICAgICAgICBjb21t aXRJbnRlcm5hbChsZWZ0LT5jaGlsZCgwKSk7Ci0gICAgICAgICAgICAgICAgY29tbWl0SW50ZXJu YWwobGVmdCk7Ci0gICAgICAgICAgICAgICAgY29tbWl0SW50ZXJuYWwocmlnaHQpOwogICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgfTsKIApAQCAtMjg5MCwxMSArMjg4 MSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgQWlyOjpPcGNvZGUgb3Bjb2RlID0gb3Bj b2RlRm9yVHlwZShFeHRyYWN0SW5zZXJ0Qml0ZmllbGRBdExvd0VuZDMyLCBFeHRyYWN0SW5zZXJ0 Qml0ZmllbGRBdExvd0VuZDY0LCBtX3ZhbHVlLT50eXBlKCkpOwogICAgICAgICAgICAgICAgIGlm ICghaXNWYWxpZEZvcm0ob3Bjb2RlLCBBcmc6OlRtcCwgQXJnOjpJbW0sIEFyZzo6SW1tLCBBcmc6 OlRtcCkpIAogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAg ICAgaWYgKGxlZnQtPm9wY29kZSgpICE9IEJpdEFuZCB8fCAhY2FuQmVJbnRlcm5hbChsZWZ0KSkK LSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgICAgIGlmIChs ZWZ0LT5jaGlsZCgwKS0+b3Bjb2RlKCkgIT0gWlNociB8fCAhY2FuQmVJbnRlcm5hbChsZWZ0LT5j aGlsZCgwKSkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAg ICAgICBpZiAocmlnaHQtPm9wY29kZSgpICE9IEJpdEFuZCB8fCAhY2FuQmVJbnRlcm5hbChyaWdo dCkpCisgICAgICAgICAgICAgICAgaWYgKGxlZnQtPm9wY29kZSgpICE9IEJpdEFuZCB8fCBsZWZ0 LT5jaGlsZCgwKS0+b3Bjb2RlKCkgIT0gWlNociB8fCByaWdodC0+b3Bjb2RlKCkgIT0gQml0QW5k KQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBW YWx1ZSogblZhbHVlID0gbGVmdC0+Y2hpbGQoMCktPmNoaWxkKDApOwpAQCAtMjkzMCw5ICsyOTE3 LDYgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBUbXAgcmVzdWx0ID0gdG1wKG1fdmFsdWUp OwogICAgICAgICAgICAgICAgIGFwcGVuZChyZWxheGVkTW92ZUZvclR5cGUobV92YWx1ZS0+dHlw ZSgpKSwgdG1wKGRWYWx1ZSksIHJlc3VsdCk7CiAgICAgICAgICAgICAgICAgYXBwZW5kKG9wY29k ZSwgdG1wKG5WYWx1ZSksIGltbShsc2JWYWx1ZSksIGltbSh3aWR0aCksIHJlc3VsdCk7Ci0gICAg ICAgICAgICAgICAgY29tbWl0SW50ZXJuYWwobGVmdC0+Y2hpbGQoMCkpOwotICAgICAgICAgICAg ICAgIGNvbW1pdEludGVybmFsKGxlZnQpOwotICAgICAgICAgICAgICAgIGNvbW1pdEludGVybmFs KHJpZ2h0KTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH07CiAK QEAgLTI5NDQsNyArMjkyOCw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgQWlyOjpPcGNv ZGUgb3Bjb2RlID0gb3Bjb2RlRm9yVHlwZShPck5vdDMyLCBPck5vdDY0LCBtX3ZhbHVlLT50eXBl KCkpOwogICAgICAgICAgICAgICAgIGlmICghaXNWYWxpZEZvcm0ob3Bjb2RlLCBBcmc6OlRtcCwg QXJnOjpUbXAsIEFyZzo6VG1wKSkgCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgICAgICAgICBpZiAocmlnaHQtPm9wY29kZSgpICE9IEJpdFhvciB8fCAhY2FuQmVJ bnRlcm5hbChyaWdodCkpCisgICAgICAgICAgICAgICAgaWYgKHJpZ2h0LT5vcGNvZGUoKSAhPSBC aXRYb3IpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAg ICAgIFZhbHVlKiBuVmFsdWUgPSBsZWZ0OwpAQCAtMjk1NCw3ICsyOTM4LDYgQEAgcHJpdmF0ZToK ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICAgICAgYXBw ZW5kKG9wY29kZSwgdG1wKG5WYWx1ZSksIHRtcChtVmFsdWUpLCB0bXAobV92YWx1ZSkpOwotICAg ICAgICAgICAgICAgIGNvbW1pdEludGVybmFsKHJpZ2h0KTsKICAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAgICAgICAgIH07CiAKQEAgLTMwMDYsNyArMjk4OSw3IEBAIHByaXZhdGU6 CiAgICAgICAgICAgICAgICAgQWlyOjpPcGNvZGUgb3Bjb2RlID0gb3Bjb2RlRm9yVHlwZShJbnNl cnRVbnNpZ25lZEJpdGZpZWxkSW5aZXJvMzIsIEluc2VydFVuc2lnbmVkQml0ZmllbGRJblplcm82 NCwgbV92YWx1ZS0+dHlwZSgpKTsKICAgICAgICAgICAgICAgICBpZiAoIWlzVmFsaWRGb3JtKG9w Y29kZSwgQXJnOjpUbXAsIEFyZzo6SW1tLCBBcmc6OkltbSwgQXJnOjpUbXApKQogICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKGxlZnQtPm9wY29k ZSgpICE9IEJpdEFuZCB8fCAhY2FuQmVJbnRlcm5hbChsZWZ0KSkKKyAgICAgICAgICAgICAgICBp ZiAobGVmdC0+b3Bjb2RlKCkgIT0gQml0QW5kKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICAgICAgICAgICAgICBWYWx1ZSogblZhbHVlID0gbGVmdC0+Y2hpbGQoMCk7 CkBAIC0zMDI0LDcgKzMwMDcsNiBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBhcHBlbmQob3Bjb2RlLCB0bXAoblZhbHVlKSwg aW1tKHJpZ2h0KSwgaW1tKHdpZHRoKSwgdG1wKG1fdmFsdWUpKTsKLSAgICAgICAgICAgICAgICBj b21taXRJbnRlcm5hbChsZWZ0KTsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAg ICAgICAgIH07CiAKQEAgLTMwMzksOSArMzAyMSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAg ICAgQWlyOjpPcGNvZGUgb3Bjb2RlID0gb3Bjb2RlRm9yVHlwZShJbnNlcnRTaWduZWRCaXRmaWVs ZEluWmVybzMyLCBJbnNlcnRTaWduZWRCaXRmaWVsZEluWmVybzY0LCBtX3ZhbHVlLT50eXBlKCkp OwogICAgICAgICAgICAgICAgIGlmICghaXNWYWxpZEZvcm0ob3Bjb2RlLCBBcmc6OlRtcCwgQXJn OjpJbW0sIEFyZzo6SW1tLCBBcmc6OlRtcCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAgICAgICAgICAgICBpZiAobGVmdC0+b3Bjb2RlKCkgIT0gU1NociB8fCAhY2Fu QmVJbnRlcm5hbChsZWZ0KSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg ICAgICAgICAgICAgIGlmIChsZWZ0LT5jaGlsZCgwKS0+b3Bjb2RlKCkgIT0gU2hsIHx8ICFjYW5C ZUludGVybmFsKGxlZnQtPmNoaWxkKDApKSkKKyAgICAgICAgICAgICAgICBpZiAobGVmdC0+b3Bj b2RlKCkgIT0gU1NociB8fCBsZWZ0LT5jaGlsZCgwKS0+b3Bjb2RlKCkgIT0gU2hsKQogICAgICAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBWYWx1ZSogc3Jj VmFsdWUgPSBsZWZ0LT5jaGlsZCgwKS0+Y2hpbGQoMCk7CkBAIC0zMDY0LDggKzMwNDQsNiBAQCBw cml2YXRlOgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAg ICAgICBhcHBlbmQob3Bjb2RlLCB0bXAoc3JjVmFsdWUpLCBpbW0obHNiVmFsdWUpLCBpbW0od2lk dGgpLCB0bXAobV92YWx1ZSkpOwotICAgICAgICAgICAgICAgIGNvbW1pdEludGVybmFsKGxlZnQt PmNoaWxkKDApKTsKLSAgICAgICAgICAgICAgICBjb21taXRJbnRlcm5hbChsZWZ0KTsKICAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH07CiAKQEAgLTMwOTEsOSArMzA2 OSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgQWlyOjpPcGNvZGUgb3Bjb2RlID0gb3Bj b2RlRm9yVHlwZShFeHRyYWN0U2lnbmVkQml0ZmllbGQzMiwgRXh0cmFjdFNpZ25lZEJpdGZpZWxk NjQsIG1fdmFsdWUtPnR5cGUoKSk7CiAgICAgICAgICAgICAgICAgaWYgKCFpc1ZhbGlkRm9ybShv cGNvZGUsIEFyZzo6VG1wLCBBcmc6OkltbSwgQXJnOjpJbW0sIEFyZzo6VG1wKSkKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgICAgIGlmIChsZWZ0LT5vcGNv ZGUoKSAhPSBTaGwgfHwgIWNhbkJlSW50ZXJuYWwobGVmdCkpCi0gICAgICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAoKGxlZnQtPmNoaWxkKDApLT5vcGNv ZGUoKSAhPSBaU2hyICYmIGxlZnQtPmNoaWxkKDApLT5vcGNvZGUoKSAhPSBTU2hyKSB8fCAhY2Fu QmVJbnRlcm5hbChsZWZ0LT5jaGlsZCgwKSkpCisgICAgICAgICAgICAgICAgaWYgKGxlZnQtPm9w Y29kZSgpICE9IFNobCB8fCAobGVmdC0+Y2hpbGQoMCktPm9wY29kZSgpICE9IFpTaHIgJiYgbGVm dC0+Y2hpbGQoMCktPm9wY29kZSgpICE9IFNTaHIpKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBWYWx1ZSogc3JjVmFsdWUgPSBsZWZ0LT5jaGls ZCgwKS0+Y2hpbGQoMCk7CkBAIC0zMTE2LDggKzMwOTIsNiBAQCBwcml2YXRlOgogICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBhcHBlbmQob3Bjb2Rl LCB0bXAoc3JjVmFsdWUpLCBpbW0obHNiVmFsdWUpLCBpbW0od2lkdGgpLCB0bXAobV92YWx1ZSkp OwotICAgICAgICAgICAgICAgIGNvbW1pdEludGVybmFsKGxlZnQtPmNoaWxkKDApKTsKLSAgICAg ICAgICAgICAgICBjb21taXRJbnRlcm5hbChsZWZ0KTsKICAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICAgICAgICAgIH07CiAK