210721 2020-04-19 08:16:56 -0700 [JSC] LLInt slow path call should not have third argument 2020-04-19 16:54:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=175454 InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1643200 0 ysuzuki 2020-04-19 08:16:56 -0700 [JSC] LLInt slow path call should not have third argument 1643201 1 396908 ysuzuki 2020-04-19 08:18:12 -0700 Created attachment 396908 Patch 1643203 2 396909 ysuzuki 2020-04-19 08:26:21 -0700 Created attachment 396909 Patch 1643211 3 396909 mark.lam 2020-04-19 08:56:34 -0700 Comment on attachment 396909 Patch r=me 1643247 4 396909 saam 2020-04-19 13:41:56 -0700 Comment on attachment 396909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396909&action=review Wasn’t the goal to speed this up though? > Source/JavaScriptCore/ChangeLog:8 > + LLInt callSlowPath does not work with third argument in Windows, CLoop etc. LLInt slow-path should not take third argument, Why doesn’t it work? 1643249 5 mark.lam 2020-04-19 13:59:28 -0700 (In reply to Saam Barati from comment #4) > Comment on attachment 396909 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=396909&action=review > > Wasn’t the goal to speed this up though? > > > Source/JavaScriptCore/ChangeLog:8 > > + LLInt callSlowPath does not work with third argument in Windows, CLoop etc. LLInt slow-path should not take third argument, > > Why doesn’t it work? Because the CLoop is able to call arbitrary native functions. It needs to be taught how call a native function with different arguments. As for Windows, I suspect it is just a matter teaching it how to call with a 3rd argument due to ABI differences. 1643250 6 mark.lam 2020-04-19 14:00:16 -0700 (In reply to Mark Lam from comment #5) > (In reply to Saam Barati from comment #4) > > Comment on attachment 396909 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=396909&action=review > > > > Wasn’t the goal to speed this up though? > > > > > Source/JavaScriptCore/ChangeLog:8 > > > + LLInt callSlowPath does not work with third argument in Windows, CLoop etc. LLInt slow-path should not take third argument, > > > > Why doesn’t it work? > > Because the CLoop is able to call arbitrary native functions. typo: I meant "is NOT able to" 1643262 7 ysuzuki 2020-04-19 16:50:45 -0700 I think this change does not introduce speed down in LLInt since LLInt is anyway loading metadata in asm side. For baseline, it would be possible that this causes speed down. I think in this case, the right thing is introducing JIT operation instead of sharing this with LLInt. I'll create a patch for Baseline after landing this to fix Windows. 1643263 8 ysuzuki 2020-04-19 16:53:45 -0700 Committed r260344: <https://trac.webkit.org/changeset/260344> 1643264 9 webkit-bug-importer 2020-04-19 16:54:14 -0700 <rdar://problem/62033808> 396908 2020-04-19 08:18:12 -0700 2020-04-19 08:26:20 -0700 Patch bug-210721-20200419081811.patch text/plain 8871 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk MzBiMWIxYTIyOTM1ZjY4MDUzOTg4MTYxNmIzYjFiNTZlNTNmODJlLi44NjYzODFjZmI0YTE0Zjky MmIxOTI0NmE2YzU1MjVjOGU1ZDE0Nzg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMC0wNC0xOSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIExMSW50IHNsb3cgcGF0aCBjYWxsIHNob3VsZCBub3QgaGF2ZSB0 aGlyZCBhcmd1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEwNzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTExJbnQgY2FsbFNsb3dQYXRoIGRvZXMgbm90IHdvcmsgd2l0aCB0aGlyZCBhcmd1bWVu dCBpbiBXaW5kb3dzLCBDTG9vcCBldGMuIExMSW50IHNsb3ctcGF0aCBzaG91bGQgbm90IHRha2Ug dGhpcmQgYXJndW1lbnQsCisgICAgICAgIGluc3RlYWQsIHVzZSBgYnl0ZWNvZGUubWV0YWRhdGEo Li4uKWAgdG8gZ2V0IG1ldGFkYXRhLgorCisgICAgICAgICogbGxpbnQvTG93TGV2ZWxJbnRlcnBy ZXRlcjY0LmFzbToKKyAgICAgICAgKiBydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHA6CisgICAg ICAgIChKU0M6Oml0ZXJhdG9yX29wZW5fdHJ5X2Zhc3QpOgorICAgICAgICAoSlNDOjppdGVyYXRv cl9vcGVuX3RyeV9mYXN0X25hcnJvdyk6CisgICAgICAgIChKU0M6Oml0ZXJhdG9yX29wZW5fdHJ5 X2Zhc3Rfd2lkZTE2KToKKyAgICAgICAgKEpTQzo6aXRlcmF0b3Jfb3Blbl90cnlfZmFzdF93aWRl MzIpOgorICAgICAgICAoSlNDOjppdGVyYXRvcl9uZXh0X3RyeV9mYXN0KToKKyAgICAgICAgKEpT Qzo6aXRlcmF0b3JfbmV4dF90cnlfZmFzdF9uYXJyb3cpOgorICAgICAgICAoSlNDOjppdGVyYXRv cl9uZXh0X3RyeV9mYXN0X3dpZGUxNik6CisgICAgICAgIChKU0M6Oml0ZXJhdG9yX25leHRfdHJ5 X2Zhc3Rfd2lkZTMyKToKKyAgICAgICAgKiBydW50aW1lL0NvbW1vblNsb3dQYXRocy5oOgorCiAy MDIwLTA0LTE4ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIEZpeCBDTG9vcCBidWlsZCBmb3IgaXRlcmF0b3Igb3Bjb2RlcwpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5hc20gYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQppbmRleCAx YjE5MjFhNjdmM2Y0NGZkYzcwMmVlNWI5YWVlODA5ZTk4N2U3Y2E5Li42NTU5MmU4MjRkNjQwODFk MDczY2I2MzIxMGFjNjYzNjg4NzdmMWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQpAQCAtMjY1OSw3ICsyNjU5LDYg QEAgZW5kKQogCiAKIGxsaW50T3BXaXRoTWV0YWRhdGEob3BfaXRlcmF0b3Jfb3BlbiwgT3BJdGVy YXRvck9wZW4sIG1hY3JvIChzaXplLCBnZXQsIGRpc3BhdGNoLCBtZXRhZGF0YSwgcmV0dXJuKQot ICAgIG1ldGFkYXRhKGEyLCB0NSkKICAgICBtYWNybyBmYXN0TmFycm93KCkKICAgICAgICAgY2Fs bFNsb3dQYXRoKF9pdGVyYXRvcl9vcGVuX3RyeV9mYXN0X25hcnJvdykKICAgICBlbmQKQEAgLTI3 MTcsNyArMjcxNiw2IEBAIGxsaW50T3BXaXRoTWV0YWRhdGEob3BfaXRlcmF0b3JfbmV4dCwgT3BJ dGVyYXRvck5leHQsIG1hY3JvIChzaXplLCBnZXQsIGRpc3BhdGNoCiAKICAgICBsb2FkVmFyaWFi bGUoZ2V0LCBtX25leHQsIHQwKQogICAgIGJ0cW56IHQwLCB0MCwgLml0ZXJhdG9yTmV4dEdlbmVy aWMKLSAgICBtZXRhZGF0YShhMiwgdDUpCiAgICAgbWFjcm8gZmFzdE5hcnJvdygpCiAgICAgICAg IGNhbGxTbG93UGF0aChfaXRlcmF0b3JfbmV4dF90cnlfZmFzdF9uYXJyb3cpCiAgICAgZW5kCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNwcApp bmRleCBiOGY1MGQ2ZmM0ODE4MjAyNmZkNTI4MjQwN2U2YmNmN2VkNDZkNmU2Li44OTM5NjVjMzIx YjNlODA0ODAwODQ0NzYyMTY1OTkxYjcxMGVhMmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAKQEAgLTg1NSwxMyArODU1LDEzIEBA IFNMT1dfUEFUSF9ERUNMKHNsb3dfcGF0aF9pbl9ieV9pZCkKIH0KIAogdGVtcGxhdGU8T3Bjb2Rl U2l6ZSB3aWR0aD4KLVNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3Jfb3Blbl90 cnlfZmFzdChDYWxsRnJhbWUqIGNhbGxGcmFtZSwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lk KiBtZXRhZGF0YVB0cikKK1Nsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3Jfb3Bl bl90cnlfZmFzdChDYWxsRnJhbWUqIGNhbGxGcmFtZSwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjKQog ewogICAgIC8vIERvbid0IHNldCBQQzsgd2UgY2FuJ3QgdGhyb3cgYW5kIGl0J3MgcmVsYXRpdmVs eSBzbG93LgogICAgIEJFR0lOX05PX1NFVF9QQygpOwogCiAgICAgYXV0byBieXRlY29kZSA9IHBj LT5hc0tub3duV2lkdGg8T3BJdGVyYXRvck9wZW4sIHdpZHRoPigpOwotICAgIGF1dG8mIG1ldGFk YXRhID0gKnJlaW50ZXJwcmV0X2Nhc3Q8T3BJdGVyYXRvck9wZW46Ok1ldGFkYXRhKj4obWV0YWRh dGFQdHIpOworICAgIGF1dG8mIG1ldGFkYXRhID0gYnl0ZWNvZGUubWV0YWRhdGEoY29kZUJsb2Nr KTsKICAgICBKU1ZhbHVlIGl0ZXJhYmxlID0gR0VUX0MoYnl0ZWNvZGUubV9pdGVyYWJsZSkuanNW YWx1ZSgpOwogICAgIFBST0ZJTEVfVkFMVUVfSU4oaXRlcmFibGUsIG1faXRlcmFibGVQcm9maWxl KTsKICAgICBKU1ZhbHVlIHN5bWJvbEl0ZXJhdG9yID0gR0VUX0MoYnl0ZWNvZGUubV9zeW1ib2xJ dGVyYXRvcikuanNWYWx1ZSgpOwpAQCAtOTAwLDI4ICs5MDAsMjggQEAgU2xvd1BhdGhSZXR1cm5U eXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0KENhbGxGcmFtZSogY2FsbEZyYW1l LCBjb25zdAogICAgIHJldHVybiBlbmNvZGVSZXN1bHQocGMsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9p ZCo+KEl0ZXJhdGlvbk1vZGU6OkdlbmVyaWMpKTsKIH0KIAotU2xvd1BhdGhSZXR1cm5UeXBlIFNM T1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0X25hcnJvdyhDYWxsRnJhbWUqIGNhbGxGcmFt ZSwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YVB0cikKK1Nsb3dQYXRoUmV0 dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3Jfb3Blbl90cnlfZmFzdF9uYXJyb3coQ2FsbEZyYW1l KiBjYWxsRnJhbWUsIGNvbnN0IEluc3RydWN0aW9uKiBwYykKIHsKLSAgICByZXR1cm4gaXRlcmF0 b3Jfb3Blbl90cnlfZmFzdDxOYXJyb3c+KGNhbGxGcmFtZSwgcGMsIG1ldGFkYXRhUHRyKTsKKyAg ICByZXR1cm4gaXRlcmF0b3Jfb3Blbl90cnlfZmFzdDxOYXJyb3c+KGNhbGxGcmFtZSwgcGMpOwog fQogCi1TbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3Rf d2lkZTE2KENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQq IG1ldGFkYXRhUHRyKQorU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVu X3RyeV9mYXN0X3dpZGUxNihDYWxsRnJhbWUqIGNhbGxGcmFtZSwgY29uc3QgSW5zdHJ1Y3Rpb24q IHBjKQogewotICAgIHJldHVybiBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0PFdpZGUxNj4oY2FsbEZy YW1lLCBwYywgbWV0YWRhdGFQdHIpOworICAgIHJldHVybiBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0 PFdpZGUxNj4oY2FsbEZyYW1lLCBwYyk7CiB9CiAKLVNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BB VEggaXRlcmF0b3Jfb3Blbl90cnlfZmFzdF93aWRlMzIoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGNv bnN0IEluc3RydWN0aW9uKiBwYywgdm9pZCogbWV0YWRhdGFQdHIpCitTbG93UGF0aFJldHVyblR5 cGUgU0xPV19QQVRIIGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3Rfd2lkZTMyKENhbGxGcmFtZSogY2Fs bEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMpCiB7Ci0gICAgcmV0dXJuIGl0ZXJhdG9yX29w ZW5fdHJ5X2Zhc3Q8V2lkZTMyPihjYWxsRnJhbWUsIHBjLCBtZXRhZGF0YVB0cik7CisgICAgcmV0 dXJuIGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3Q8V2lkZTMyPihjYWxsRnJhbWUsIHBjKTsKIH0KIAog dGVtcGxhdGU8T3Bjb2RlU2l6ZSB3aWR0aD4KLVNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BBVEgg aXRlcmF0b3JfbmV4dF90cnlfZmFzdChDYWxsRnJhbWUqIGNhbGxGcmFtZSwgY29uc3QgSW5zdHJ1 Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YVB0cikKK1Nsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BB VEggaXRlcmF0b3JfbmV4dF90cnlfZmFzdChDYWxsRnJhbWUqIGNhbGxGcmFtZSwgY29uc3QgSW5z dHJ1Y3Rpb24qIHBjKQogewogICAgIEJFR0lOKCk7CiAKICAgICBhdXRvIGJ5dGVjb2RlID0gcGMt PmFzS25vd25XaWR0aDxPcEl0ZXJhdG9yTmV4dCwgd2lkdGg+KCk7Ci0gICAgYXV0byYgbWV0YWRh dGEgPSAqcmVpbnRlcnByZXRfY2FzdDxPcEl0ZXJhdG9yTmV4dDo6TWV0YWRhdGEqPihtZXRhZGF0 YVB0cik7CisgICAgYXV0byYgbWV0YWRhdGEgPSBieXRlY29kZS5tZXRhZGF0YShjb2RlQmxvY2sp OwogCiAgICAgQVNTRVJUKCFHRVQoYnl0ZWNvZGUubV9uZXh0KS5qc1ZhbHVlKCkpOwogICAgIEpT T2JqZWN0KiBpdGVyYXRvciA9IGpzQ2FzdDxKU09iamVjdCo+KEdFVChieXRlY29kZS5tX2l0ZXJh dG9yKS5qc1ZhbHVlKCkpOzsKQEAgLTk1NywxOSArOTU3LDE5IEBAIFNsb3dQYXRoUmV0dXJuVHlw ZSBTTE9XX1BBVEggaXRlcmF0b3JfbmV4dF90cnlfZmFzdChDYWxsRnJhbWUqIGNhbGxGcmFtZSwg Y29uc3QKICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCi1TbG93UGF0aFJl dHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3RfbmFycm93KENhbGxGcmFt ZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQqIG1ldGFkYXRhUHRyKQor U2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9uZXh0X3RyeV9mYXN0X25hcnJv dyhDYWxsRnJhbWUqIGNhbGxGcmFtZSwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjKQogewotICAgIHJl dHVybiBpdGVyYXRvcl9uZXh0X3RyeV9mYXN0PE5hcnJvdz4oY2FsbEZyYW1lLCBwYywgbWV0YWRh dGFQdHIpOworICAgIHJldHVybiBpdGVyYXRvcl9uZXh0X3RyeV9mYXN0PE5hcnJvdz4oY2FsbEZy YW1lLCBwYyk7CiB9CiAKLVNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3JfbmV4 dF90cnlfZmFzdF93aWRlMTYoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGNvbnN0IEluc3RydWN0aW9u KiBwYywgdm9pZCogbWV0YWRhdGFQdHIpCitTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0 ZXJhdG9yX25leHRfdHJ5X2Zhc3Rfd2lkZTE2KENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdCBJ bnN0cnVjdGlvbiogcGMpCiB7Ci0gICAgcmV0dXJuIGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3Q8V2lk ZTE2PihjYWxsRnJhbWUsIHBjLCBtZXRhZGF0YVB0cik7CisgICAgcmV0dXJuIGl0ZXJhdG9yX25l eHRfdHJ5X2Zhc3Q8V2lkZTE2PihjYWxsRnJhbWUsIHBjKTsKIH0KIAotU2xvd1BhdGhSZXR1cm5U eXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9uZXh0X3RyeV9mYXN0X3dpZGUzMihDYWxsRnJhbWUqIGNh bGxGcmFtZSwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YVB0cikKK1Nsb3dQ YXRoUmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3JfbmV4dF90cnlfZmFzdF93aWRlMzIoQ2Fs bEZyYW1lKiBjYWxsRnJhbWUsIGNvbnN0IEluc3RydWN0aW9uKiBwYykKIHsKLSAgICByZXR1cm4g aXRlcmF0b3JfbmV4dF90cnlfZmFzdDxXaWRlMzI+KGNhbGxGcmFtZSwgcGMsIG1ldGFkYXRhUHRy KTsKKyAgICByZXR1cm4gaXRlcmF0b3JfbmV4dF90cnlfZmFzdDxXaWRlMzI+KGNhbGxGcmFtZSwg cGMpOwogfQogCiBTTE9XX1BBVEhfREVDTChzbG93X3BhdGhfZGVsX2J5X3ZhbCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmgKaW5kZXggMGI0NDNl OTdhOGYxYjY3Y2M4ZmI5NmQ1NDc1ZWEwYTVkNDdhMGVjNi4uZGQ2MWM1NzQyN2FkMGY3MmUxYjU4 YzFiMzUxMWYxNGJmZDg3YWFmMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvQ29tbW9uU2xvd1BhdGhzLmgKQEAgLTI4NCwxNiArMjg0LDE2IEBAIFNMT1dfUEFUSF9ISURE RU5fREVDTChzbG93X3BhdGhfbmV3X2FycmF5X2J1ZmZlcik7CiBTTE9XX1BBVEhfSElEREVOX0RF Q0woc2xvd19wYXRoX3NwcmVhZCk7CiAKIHRlbXBsYXRlPE9wY29kZVNpemUgc2l6ZT4KLWV4dGVy biBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3QoQ2Fs bEZyYW1lKiwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YSk7Ci1leHRlcm4g IkMiIFNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3Jfb3Blbl90cnlfZmFzdF9u YXJyb3coQ2FsbEZyYW1lKiwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YSA9 IG51bGxwdHIpOwotZXh0ZXJuICJDIiBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJh dG9yX29wZW5fdHJ5X2Zhc3Rfd2lkZTE2KENhbGxGcmFtZSosIGNvbnN0IEluc3RydWN0aW9uKiBw Yywgdm9pZCogbWV0YWRhdGEgPSBudWxscHRyKTsKLWV4dGVybiAiQyIgU2xvd1BhdGhSZXR1cm5U eXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0X3dpZGUzMihDYWxsRnJhbWUqLCBj b25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQqIG1ldGFkYXRhID0gbnVsbHB0cik7CitleHRlcm4g U2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0KENhbGxG cmFtZSosIGNvbnN0IEluc3RydWN0aW9uKiBwYyk7CitleHRlcm4gIkMiIFNsb3dQYXRoUmV0dXJu VHlwZSBTTE9XX1BBVEggaXRlcmF0b3Jfb3Blbl90cnlfZmFzdF9uYXJyb3coQ2FsbEZyYW1lKiwg Y29uc3QgSW5zdHJ1Y3Rpb24qIHBjKTsKK2V4dGVybiAiQyIgU2xvd1BhdGhSZXR1cm5UeXBlIFNM T1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0X3dpZGUxNihDYWxsRnJhbWUqLCBjb25zdCBJ bnN0cnVjdGlvbiogcGMpOworZXh0ZXJuICJDIiBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRI IGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3Rfd2lkZTMyKENhbGxGcmFtZSosIGNvbnN0IEluc3RydWN0 aW9uKiBwYyk7CiAKIHRlbXBsYXRlPE9wY29kZVNpemUgc2l6ZT4KLWV4dGVybiBTbG93UGF0aFJl dHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3QoQ2FsbEZyYW1lKiwgY29u c3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YSk7Ci1leHRlcm4gIkMiIFNsb3dQYXRo UmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3JfbmV4dF90cnlfZmFzdF9uYXJyb3coQ2FsbEZy YW1lKiwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YSA9IG51bGxwdHIpOwot ZXh0ZXJuICJDIiBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX25leHRfdHJ5 X2Zhc3Rfd2lkZTE2KENhbGxGcmFtZSosIGNvbnN0IEluc3RydWN0aW9uKiBwYywgdm9pZCogbWV0 YWRhdGEgPSBudWxscHRyKTsKLWV4dGVybiAiQyIgU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFU SCBpdGVyYXRvcl9uZXh0X3RyeV9mYXN0X3dpZGUzMihDYWxsRnJhbWUqLCBjb25zdCBJbnN0cnVj dGlvbiogcGMsIHZvaWQqIG1ldGFkYXRhID0gbnVsbHB0cik7CitleHRlcm4gU2xvd1BhdGhSZXR1 cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9uZXh0X3RyeV9mYXN0KENhbGxGcmFtZSosIGNvbnN0 IEluc3RydWN0aW9uKiBwYyk7CitleHRlcm4gIkMiIFNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BB VEggaXRlcmF0b3JfbmV4dF90cnlfZmFzdF9uYXJyb3coQ2FsbEZyYW1lKiwgY29uc3QgSW5zdHJ1 Y3Rpb24qIHBjKTsKK2V4dGVybiAiQyIgU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVy YXRvcl9uZXh0X3RyeV9mYXN0X3dpZGUxNihDYWxsRnJhbWUqLCBjb25zdCBJbnN0cnVjdGlvbiog cGMpOworZXh0ZXJuICJDIiBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX25l eHRfdHJ5X2Zhc3Rfd2lkZTMyKENhbGxGcmFtZSosIGNvbnN0IEluc3RydWN0aW9uKiBwYyk7CiAK IHVzaW5nIFNsb3dQYXRoRnVuY3Rpb24gPSBTbG93UGF0aFJldHVyblR5cGUoU0xPV19QQVRIICop KENhbGxGcmFtZSosIGNvbnN0IEluc3RydWN0aW9uKik7CiAK 396909 2020-04-19 08:26:21 -0700 2020-04-19 08:56:34 -0700 Patch bug-210721-20200419082620.patch text/plain 9993 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk MzBiMWIxYTIyOTM1ZjY4MDUzOTg4MTYxNmIzYjFiNTZlNTNmODJlLi5iMWI0Y2U0MWY5MWIwNjk1 MTM1Y2QwZmU1MmM5ZTRhM2IzZDkyNTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAyMC0wNC0xOSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIExMSW50IHNsb3cgcGF0aCBjYWxsIHNob3VsZCBub3QgaGF2ZSB0 aGlyZCBhcmd1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEwNzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTExJbnQgY2FsbFNsb3dQYXRoIGRvZXMgbm90IHdvcmsgd2l0aCB0aGlyZCBhcmd1bWVu dCBpbiBXaW5kb3dzLCBDTG9vcCBldGMuIExMSW50IHNsb3ctcGF0aCBzaG91bGQgbm90IHRha2Ug dGhpcmQgYXJndW1lbnQsCisgICAgICAgIGluc3RlYWQsIHVzZSBgYnl0ZWNvZGUubWV0YWRhdGEo Li4uKWAgdG8gZ2V0IG1ldGFkYXRhLgorCisgICAgICAgICogaml0L0pJVENhbGwuY3BwOgorICAg ICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfaXRlcmF0b3Jfb3Blbik6CisgICAgICAgIChKU0M6OkpJ VDo6ZW1pdF9vcF9pdGVyYXRvcl9uZXh0KToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVy cHJldGVyNjQuYXNtOgorICAgICAgICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNwcDoKKyAg ICAgICAgKEpTQzo6aXRlcmF0b3Jfb3Blbl90cnlfZmFzdCk6CisgICAgICAgIChKU0M6OlNMT1df UEFUSF9ERUNMKToKKyAgICAgICAgKEpTQzo6aXRlcmF0b3JfbmV4dF90cnlfZmFzdCk6CisgICAg ICAgIChKU0M6Oml0ZXJhdG9yX29wZW5fdHJ5X2Zhc3RfbmFycm93KTogRGVsZXRlZC4KKyAgICAg ICAgKEpTQzo6aXRlcmF0b3Jfb3Blbl90cnlfZmFzdF93aWRlMTYpOiBEZWxldGVkLgorICAgICAg ICAoSlNDOjppdGVyYXRvcl9vcGVuX3RyeV9mYXN0X3dpZGUzMik6IERlbGV0ZWQuCisgICAgICAg IChKU0M6Oml0ZXJhdG9yX25leHRfdHJ5X2Zhc3RfbmFycm93KTogRGVsZXRlZC4KKyAgICAgICAg KEpTQzo6aXRlcmF0b3JfbmV4dF90cnlfZmFzdF93aWRlMTYpOiBEZWxldGVkLgorICAgICAgICAo SlNDOjppdGVyYXRvcl9uZXh0X3RyeV9mYXN0X3dpZGUzMik6IERlbGV0ZWQuCisgICAgICAgICog cnVudGltZS9Db21tb25TbG93UGF0aHMuaDoKKwogMjAyMC0wNC0xOCAgS2VpdGggTWlsbGVyICA8 a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggQ0xvb3AgYnVpbGQgZm9yIGl0 ZXJhdG9yIG9wY29kZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU Q2FsbC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENhbGwuY3BwCmluZGV4IGFi NGQ4YjNjODIyYzBlOGI1NDgxNGRjOWQ0YjMyZDdlMjU4OTdjODAuLjY0ZDU5ZTMzNmY1ZWY5ZDEw NGU3YWRiMzlhYjFjMGI0NDlhNDhmZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUQ2FsbC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxs LmNwcApAQCAtMzg1LDcgKzM4NSw2IEBAIHZvaWQgSklUOjplbWl0U2xvd19vcF9jb25zdHJ1Y3Qo Y29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiwgVmVjdG9yPFNsCiB2b2lkIEpJ VDo6ZW1pdF9vcF9pdGVyYXRvcl9vcGVuKGNvbnN0IEluc3RydWN0aW9uKiBpbnN0cnVjdGlvbikK IHsKICAgICBhdXRvIGJ5dGVjb2RlID0gaW5zdHJ1Y3Rpb24tPmFzPE9wSXRlcmF0b3JPcGVuPigp OwotICAgIGF1dG8mIG1ldGFkYXRhID0gYnl0ZWNvZGUubWV0YWRhdGEobV9jb2RlQmxvY2spOwog ICAgIGF1dG8qIHRyeUZhc3RGdW5jdGlvbiA9IChbJl0gKCkgewogICAgICAgICBzd2l0Y2ggKGlu c3RydWN0aW9uLT53aWR0aCgpKSB7CiAgICAgICAgIGNhc2UgTmFycm93OiByZXR1cm4gaXRlcmF0 b3Jfb3Blbl90cnlfZmFzdF9uYXJyb3c7CkBAIC0zOTQsNyArMzkzLDcgQEAgdm9pZCBKSVQ6OmVt aXRfb3BfaXRlcmF0b3Jfb3Blbihjb25zdCBJbnN0cnVjdGlvbiogaW5zdHJ1Y3Rpb24pCiAgICAg ICAgIGRlZmF1bHQ6IFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIH0KICAg ICB9KSgpOwotICAgIHNldHVwQXJndW1lbnRzPGRlY2x0eXBlKHRyeUZhc3RGdW5jdGlvbik+KGlu c3RydWN0aW9uLCAmbWV0YWRhdGEpOworICAgIHNldHVwQXJndW1lbnRzPGRlY2x0eXBlKHRyeUZh c3RGdW5jdGlvbik+KGluc3RydWN0aW9uKTsKICAgICBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNo ZWNrKHRyeUZhc3RGdW5jdGlvbik7CiAgICAgSnVtcCBmYXN0Q2FzZSA9IGJyYW5jaDMyKE5vdEVx dWFsLCBHUFJJbmZvOjpyZXR1cm5WYWx1ZUdQUjIsIFRydXN0ZWRJbW0zMihzdGF0aWNfY2FzdDx1 aW50MzJfdD4oSXRlcmF0aW9uTW9kZTo6R2VuZXJpYykpKTsKIApAQCAtNDU1LDcgKzQ1NCw3IEBA IHZvaWQgSklUOjplbWl0X29wX2l0ZXJhdG9yX25leHQoY29uc3QgSW5zdHJ1Y3Rpb24qIGluc3Ry dWN0aW9uKQogCiAgICAgZW1pdEdldFZpcnR1YWxSZWdpc3RlcihieXRlY29kZS5tX25leHQsIHJl Z1QwKTsKICAgICBKdW1wIGdlbmVyaWNDYXNlID0gYnJhbmNoSWZOb3RFbXB0eShyZWdUMCk7Ci0g ICAgc2V0dXBBcmd1bWVudHM8ZGVjbHR5cGUodHJ5RmFzdEZ1bmN0aW9uKT4oaW5zdHJ1Y3Rpb24s ICZtZXRhZGF0YSk7CisgICAgc2V0dXBBcmd1bWVudHM8ZGVjbHR5cGUodHJ5RmFzdEZ1bmN0aW9u KT4oaW5zdHJ1Y3Rpb24pOwogICAgIGFwcGVuZENhbGxXaXRoRXhjZXB0aW9uQ2hlY2sodHJ5RmFz dEZ1bmN0aW9uKTsKICAgICBKdW1wIGZhc3RDYXNlID0gYnJhbmNoMzIoTm90RXF1YWwsIEdQUklu Zm86OnJldHVyblZhbHVlR1BSMiwgVHJ1c3RlZEltbTMyKHN0YXRpY19jYXN0PHVpbnQzMl90PihJ dGVyYXRpb25Nb2RlOjpHZW5lcmljKSkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbSBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCmluZGV4IDFiMTkyMWE2N2YzZjQ0 ZmRjNzAyZWU1YjlhZWU4MDllOTg3ZTdjYTkuLjY1NTkyZTgyNGQ2NDA4MWQwNzNjYjYzMjEwYWM2 NjM2ODg3N2YxZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dM ZXZlbEludGVycHJldGVyNjQuYXNtCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9M b3dMZXZlbEludGVycHJldGVyNjQuYXNtCkBAIC0yNjU5LDcgKzI2NTksNiBAQCBlbmQpCiAKIAog bGxpbnRPcFdpdGhNZXRhZGF0YShvcF9pdGVyYXRvcl9vcGVuLCBPcEl0ZXJhdG9yT3BlbiwgbWFj cm8gKHNpemUsIGdldCwgZGlzcGF0Y2gsIG1ldGFkYXRhLCByZXR1cm4pCi0gICAgbWV0YWRhdGEo YTIsIHQ1KQogICAgIG1hY3JvIGZhc3ROYXJyb3coKQogICAgICAgICBjYWxsU2xvd1BhdGgoX2l0 ZXJhdG9yX29wZW5fdHJ5X2Zhc3RfbmFycm93KQogICAgIGVuZApAQCAtMjcxNyw3ICsyNzE2LDYg QEAgbGxpbnRPcFdpdGhNZXRhZGF0YShvcF9pdGVyYXRvcl9uZXh0LCBPcEl0ZXJhdG9yTmV4dCwg bWFjcm8gKHNpemUsIGdldCwgZGlzcGF0Y2gKIAogICAgIGxvYWRWYXJpYWJsZShnZXQsIG1fbmV4 dCwgdDApCiAgICAgYnRxbnogdDAsIHQwLCAuaXRlcmF0b3JOZXh0R2VuZXJpYwotICAgIG1ldGFk YXRhKGEyLCB0NSkKICAgICBtYWNybyBmYXN0TmFycm93KCkKICAgICAgICAgY2FsbFNsb3dQYXRo KF9pdGVyYXRvcl9uZXh0X3RyeV9mYXN0X25hcnJvdykKICAgICBlbmQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwCmluZGV4IGI4ZjUwZDZm YzQ4MTgyMDI2ZmQ1MjgyNDA3ZTZiY2Y3ZWQ0NmQ2ZTYuLjM4ZjBjOTMyZjFlYmEzZDhkZGIwNTMx ZjZhN2Q1NDVjZDQyZmJhMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0NvbW1vblNsb3dQYXRocy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvQ29tbW9uU2xvd1BhdGhzLmNwcApAQCAtODU1LDEzICs4NTUsMTMgQEAgU0xPV19QQVRIX0RF Q0woc2xvd19wYXRoX2luX2J5X2lkKQogfQogCiB0ZW1wbGF0ZTxPcGNvZGVTaXplIHdpZHRoPgot U2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0KENhbGxG cmFtZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQqIG1ldGFkYXRhUHRy KQorU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0KENh bGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMpCiB7CiAgICAgLy8gRG9u J3Qgc2V0IFBDOyB3ZSBjYW4ndCB0aHJvdyBhbmQgaXQncyByZWxhdGl2ZWx5IHNsb3cuCiAgICAg QkVHSU5fTk9fU0VUX1BDKCk7CiAKICAgICBhdXRvIGJ5dGVjb2RlID0gcGMtPmFzS25vd25XaWR0 aDxPcEl0ZXJhdG9yT3Blbiwgd2lkdGg+KCk7Ci0gICAgYXV0byYgbWV0YWRhdGEgPSAqcmVpbnRl cnByZXRfY2FzdDxPcEl0ZXJhdG9yT3Blbjo6TWV0YWRhdGEqPihtZXRhZGF0YVB0cik7CisgICAg YXV0byYgbWV0YWRhdGEgPSBieXRlY29kZS5tZXRhZGF0YShjb2RlQmxvY2spOwogICAgIEpTVmFs dWUgaXRlcmFibGUgPSBHRVRfQyhieXRlY29kZS5tX2l0ZXJhYmxlKS5qc1ZhbHVlKCk7CiAgICAg UFJPRklMRV9WQUxVRV9JTihpdGVyYWJsZSwgbV9pdGVyYWJsZVByb2ZpbGUpOwogICAgIEpTVmFs dWUgc3ltYm9sSXRlcmF0b3IgPSBHRVRfQyhieXRlY29kZS5tX3N5bWJvbEl0ZXJhdG9yKS5qc1Zh bHVlKCk7CkBAIC05MDAsMjggKzkwMCwyOCBAQCBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRI IGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3QoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGNvbnN0CiAgICAg cmV0dXJuIGVuY29kZVJlc3VsdChwYywgcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oSXRlcmF0aW9u TW9kZTo6R2VuZXJpYykpOwogfQogCi1TbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJh dG9yX29wZW5fdHJ5X2Zhc3RfbmFycm93KENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0 cnVjdGlvbiogcGMsIHZvaWQqIG1ldGFkYXRhUHRyKQorU0xPV19QQVRIX0RFQ0woaXRlcmF0b3Jf b3Blbl90cnlfZmFzdF9uYXJyb3cpCiB7Ci0gICAgcmV0dXJuIGl0ZXJhdG9yX29wZW5fdHJ5X2Zh c3Q8TmFycm93PihjYWxsRnJhbWUsIHBjLCBtZXRhZGF0YVB0cik7CisgICAgcmV0dXJuIGl0ZXJh dG9yX29wZW5fdHJ5X2Zhc3Q8TmFycm93PihjYWxsRnJhbWUsIHBjKTsKIH0KIAotU2xvd1BhdGhS ZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0X3dpZGUxNihDYWxsRnJh bWUqIGNhbGxGcmFtZSwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YVB0cikK K1NMT1dfUEFUSF9ERUNMKGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3Rfd2lkZTE2KQogewotICAgIHJl dHVybiBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0PFdpZGUxNj4oY2FsbEZyYW1lLCBwYywgbWV0YWRh dGFQdHIpOworICAgIHJldHVybiBpdGVyYXRvcl9vcGVuX3RyeV9mYXN0PFdpZGUxNj4oY2FsbEZy YW1lLCBwYyk7CiB9CiAKLVNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3Jfb3Bl bl90cnlfZmFzdF93aWRlMzIoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGNvbnN0IEluc3RydWN0aW9u KiBwYywgdm9pZCogbWV0YWRhdGFQdHIpCitTTE9XX1BBVEhfREVDTChpdGVyYXRvcl9vcGVuX3Ry eV9mYXN0X3dpZGUzMikKIHsKLSAgICByZXR1cm4gaXRlcmF0b3Jfb3Blbl90cnlfZmFzdDxXaWRl MzI+KGNhbGxGcmFtZSwgcGMsIG1ldGFkYXRhUHRyKTsKKyAgICByZXR1cm4gaXRlcmF0b3Jfb3Bl bl90cnlfZmFzdDxXaWRlMzI+KGNhbGxGcmFtZSwgcGMpOwogfQogCiB0ZW1wbGF0ZTxPcGNvZGVT aXplIHdpZHRoPgotU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9uZXh0X3Ry eV9mYXN0KENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQq IG1ldGFkYXRhUHRyKQorU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9uZXh0 X3RyeV9mYXN0KENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMpCiB7 CiAgICAgQkVHSU4oKTsKIAogICAgIGF1dG8gYnl0ZWNvZGUgPSBwYy0+YXNLbm93bldpZHRoPE9w SXRlcmF0b3JOZXh0LCB3aWR0aD4oKTsKLSAgICBhdXRvJiBtZXRhZGF0YSA9ICpyZWludGVycHJl dF9jYXN0PE9wSXRlcmF0b3JOZXh0OjpNZXRhZGF0YSo+KG1ldGFkYXRhUHRyKTsKKyAgICBhdXRv JiBtZXRhZGF0YSA9IGJ5dGVjb2RlLm1ldGFkYXRhKGNvZGVCbG9jayk7CiAKICAgICBBU1NFUlQo IUdFVChieXRlY29kZS5tX25leHQpLmpzVmFsdWUoKSk7CiAgICAgSlNPYmplY3QqIGl0ZXJhdG9y ID0ganNDYXN0PEpTT2JqZWN0Kj4oR0VUKGJ5dGVjb2RlLm1faXRlcmF0b3IpLmpzVmFsdWUoKSk7 OwpAQCAtOTU3LDE5ICs5NTcsMTkgQEAgU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVy YXRvcl9uZXh0X3RyeV9mYXN0KENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdAogICAgIFJFTEVB U0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKLVNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BB VEggaXRlcmF0b3JfbmV4dF90cnlfZmFzdF9uYXJyb3coQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGNv bnN0IEluc3RydWN0aW9uKiBwYywgdm9pZCogbWV0YWRhdGFQdHIpCitTTE9XX1BBVEhfREVDTChp dGVyYXRvcl9uZXh0X3RyeV9mYXN0X25hcnJvdykKIHsKLSAgICByZXR1cm4gaXRlcmF0b3JfbmV4 dF90cnlfZmFzdDxOYXJyb3c+KGNhbGxGcmFtZSwgcGMsIG1ldGFkYXRhUHRyKTsKKyAgICByZXR1 cm4gaXRlcmF0b3JfbmV4dF90cnlfZmFzdDxOYXJyb3c+KGNhbGxGcmFtZSwgcGMpOwogfQogCi1T bG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3Rfd2lkZTE2 KENhbGxGcmFtZSogY2FsbEZyYW1lLCBjb25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQqIG1ldGFk YXRhUHRyKQorU0xPV19QQVRIX0RFQ0woaXRlcmF0b3JfbmV4dF90cnlfZmFzdF93aWRlMTYpCiB7 Ci0gICAgcmV0dXJuIGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3Q8V2lkZTE2PihjYWxsRnJhbWUsIHBj LCBtZXRhZGF0YVB0cik7CisgICAgcmV0dXJuIGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3Q8V2lkZTE2 PihjYWxsRnJhbWUsIHBjKTsKIH0KIAotU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVy YXRvcl9uZXh0X3RyeV9mYXN0X3dpZGUzMihDYWxsRnJhbWUqIGNhbGxGcmFtZSwgY29uc3QgSW5z dHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YVB0cikKK1NMT1dfUEFUSF9ERUNMKGl0ZXJhdG9y X25leHRfdHJ5X2Zhc3Rfd2lkZTMyKQogewotICAgIHJldHVybiBpdGVyYXRvcl9uZXh0X3RyeV9m YXN0PFdpZGUzMj4oY2FsbEZyYW1lLCBwYywgbWV0YWRhdGFQdHIpOworICAgIHJldHVybiBpdGVy YXRvcl9uZXh0X3RyeV9mYXN0PFdpZGUzMj4oY2FsbEZyYW1lLCBwYyk7CiB9CiAKIFNMT1dfUEFU SF9ERUNMKHNsb3dfcGF0aF9kZWxfYnlfdmFsKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9Db21tb25TbG93UGF0aHMuaAppbmRleCAwYjQ0M2U5N2E4ZjFiNjdjYzhmYjk2ZDU0 NzVlYTBhNWQ0N2EwZWM2Li5hODI0OGQ0NTI0YTNjNWRmMDlkYWY2NDk3NDY2Yjk3MjUwMzMyNTZm IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0 aHMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMu aApAQCAtMjgyLDE4ICsyODIsMTIgQEAgU0xPV19QQVRIX0hJRERFTl9ERUNMKHNsb3dfcGF0aF9u ZXdfZ2VuZXJhdG9yKTsKIFNMT1dfUEFUSF9ISURERU5fREVDTChzbG93X3BhdGhfbmV3X2FycmF5 X3dpdGhfc3ByZWFkKTsKIFNMT1dfUEFUSF9ISURERU5fREVDTChzbG93X3BhdGhfbmV3X2FycmF5 X2J1ZmZlcik7CiBTTE9XX1BBVEhfSElEREVOX0RFQ0woc2xvd19wYXRoX3NwcmVhZCk7Ci0KLXRl bXBsYXRlPE9wY29kZVNpemUgc2l6ZT4KLWV4dGVybiBTbG93UGF0aFJldHVyblR5cGUgU0xPV19Q QVRIIGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3QoQ2FsbEZyYW1lKiwgY29uc3QgSW5zdHJ1Y3Rpb24q IHBjLCB2b2lkKiBtZXRhZGF0YSk7Ci1leHRlcm4gIkMiIFNsb3dQYXRoUmV0dXJuVHlwZSBTTE9X X1BBVEggaXRlcmF0b3Jfb3Blbl90cnlfZmFzdF9uYXJyb3coQ2FsbEZyYW1lKiwgY29uc3QgSW5z dHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YSA9IG51bGxwdHIpOwotZXh0ZXJuICJDIiBTbG93 UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3Rfd2lkZTE2KENh bGxGcmFtZSosIGNvbnN0IEluc3RydWN0aW9uKiBwYywgdm9pZCogbWV0YWRhdGEgPSBudWxscHRy KTsKLWV4dGVybiAiQyIgU2xvd1BhdGhSZXR1cm5UeXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9vcGVu X3RyeV9mYXN0X3dpZGUzMihDYWxsRnJhbWUqLCBjb25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQq IG1ldGFkYXRhID0gbnVsbHB0cik7Ci0KLXRlbXBsYXRlPE9wY29kZVNpemUgc2l6ZT4KLWV4dGVy biBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3QoQ2Fs bEZyYW1lKiwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YSk7Ci1leHRlcm4g IkMiIFNsb3dQYXRoUmV0dXJuVHlwZSBTTE9XX1BBVEggaXRlcmF0b3JfbmV4dF90cnlfZmFzdF9u YXJyb3coQ2FsbEZyYW1lKiwgY29uc3QgSW5zdHJ1Y3Rpb24qIHBjLCB2b2lkKiBtZXRhZGF0YSA9 IG51bGxwdHIpOwotZXh0ZXJuICJDIiBTbG93UGF0aFJldHVyblR5cGUgU0xPV19QQVRIIGl0ZXJh dG9yX25leHRfdHJ5X2Zhc3Rfd2lkZTE2KENhbGxGcmFtZSosIGNvbnN0IEluc3RydWN0aW9uKiBw Yywgdm9pZCogbWV0YWRhdGEgPSBudWxscHRyKTsKLWV4dGVybiAiQyIgU2xvd1BhdGhSZXR1cm5U eXBlIFNMT1dfUEFUSCBpdGVyYXRvcl9uZXh0X3RyeV9mYXN0X3dpZGUzMihDYWxsRnJhbWUqLCBj b25zdCBJbnN0cnVjdGlvbiogcGMsIHZvaWQqIG1ldGFkYXRhID0gbnVsbHB0cik7CitTTE9XX1BB VEhfSElEREVOX0RFQ0woaXRlcmF0b3Jfb3Blbl90cnlfZmFzdF9uYXJyb3cpOworU0xPV19QQVRI X0hJRERFTl9ERUNMKGl0ZXJhdG9yX29wZW5fdHJ5X2Zhc3Rfd2lkZTE2KTsKK1NMT1dfUEFUSF9I SURERU5fREVDTChpdGVyYXRvcl9vcGVuX3RyeV9mYXN0X3dpZGUzMik7CitTTE9XX1BBVEhfSElE REVOX0RFQ0woaXRlcmF0b3JfbmV4dF90cnlfZmFzdF9uYXJyb3cpOworU0xPV19QQVRIX0hJRERF Tl9ERUNMKGl0ZXJhdG9yX25leHRfdHJ5X2Zhc3Rfd2lkZTE2KTsKK1NMT1dfUEFUSF9ISURERU5f REVDTChpdGVyYXRvcl9uZXh0X3RyeV9mYXN0X3dpZGUzMik7CiAKIHVzaW5nIFNsb3dQYXRoRnVu Y3Rpb24gPSBTbG93UGF0aFJldHVyblR5cGUoU0xPV19QQVRIICopKENhbGxGcmFtZSosIGNvbnN0 IEluc3RydWN0aW9uKik7CiAK