162993 2016-10-05 20:22:46 -0700 [JSC] Do not construct Simple GetByIdStatus against self-custom-accessor case 2016-10-05 21:27:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162941 1 ysuzuki ysuzuki commit-queue fpizlo keith_miller mark.lam msaboff saam oldest_to_newest 1236877 0 ysuzuki 2016-10-05 20:22:46 -0700 [JSC] Do not construct Simple GetByIdStatus against self-custom-accessor case 1236878 1 290774 ysuzuki 2016-10-05 20:30:04 -0700 Created attachment 290774 Patch 1236880 2 ysuzuki 2016-10-05 20:31:31 -0700 This bug occurs when running https://bugs.webkit.org/show_bug.cgi?id=162941 tests on DFG eager mode. 1236886 3 290778 ysuzuki 2016-10-05 20:48:39 -0700 Created attachment 290778 Patch 1236894 4 290778 ysuzuki 2016-10-05 21:25:18 -0700 Comment on attachment 290778 Patch Thanks! 1236895 5 ysuzuki 2016-10-05 21:27:29 -0700 Committed r206844: <http://trac.webkit.org/changeset/206844> 290774 2016-10-05 20:30:04 -0700 2016-10-05 20:48:35 -0700 Patch bug-162993-20161006122651.patch text/plain 4335 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2ODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NWRlOGEzMTlkODE3NTQyNGExYjM5OGYyOWJmZWE5OGExOWQ5MGVkLi4wYThhOTkyYmUyYmFjN2Q5 MDNjNmQ5MDY0M2U2YWI1MDM2OGU2Yzg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNi0xMC0wNSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBEbyBub3QgY29uc3RydWN0IFNpbXBsZSBHZXRCeUlkU3Rh dHVzIGFnYWluc3Qgc2VsZi1jdXN0b20tYWNjZXNzb3IgY2FzZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYyOTkzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgYWNjaWRlbnRhbGx5IGNyZWF0ZWQgYSBT aW1wbGUgR2V0QnlJZFN0YXR1cyBhZ2FpbnN0IHNlbGYtY3VzdG9tLWFjY2Vzc29yIGNhc2U6IHRo ZSBvYmplY3QgaGFzIG93biBjdXN0b20gYWNjZXNzb3IgcHJvcGVydHkgYW5kIGdldF9ieV9pZCBo aXRzLgorICAgICAgICBJZiB3ZSByZXR1cm5lZCBzdWNoIGEgcmVzdWx0LCB0aGUgR2V0QnlJZCB3 aWxsIGJlIHR1cm5lZCB0byBHZXRCeU9mZnNldCBhbmQgaXQgbG9va3MgdXAgaW5jb3JyZWN0IHRo aW5nIGxpa2UgQ3VzdG9tR2V0dGVyU2V0dGVyIG9iamVjdC4KKyAgICAgICAgV2UgZG8gbm90IGhp dCB0aGlzIGJ1ZyBiZWZvcmUgc2luY2UgbWF5YmUgdGhlcmUgaXMgbm8gb2JqZWN0IHRoYXQgaGFz IG93biBjdXN0b20tYWNjZXNzb3IgYW5kIHRoaXMgY3VzdG9tLWFjY2Vzc29yIGRvZXMgbm90IHJh aXNlIGFuIGVycm9yLgorICAgICAgICBGb3IgZXhhbXBsZSwgIk5vZGUucHJvdG90eXBlIiBoYXMg ImZpcnN0Q2hpbGQiIGN1c3RvbSBhY2Nlc3Nvci4gQnV0IHNpbmNlICJOb2RlLnByb3RvdHlwZSIg aXRzZWxmIGRvZXMgbm90IGhhcyBOb2RlOjppbmZvKCksICJOb2RlLnByb3RvdHlwZS5maXJzdENo aWxkIgorICAgICAgICBhY2Nlc3MgYWx3YXlzIHJhaXNlcyBhbiBlcnJvci4gSSBndWVzcyBhbGwg dGhlIGN1c3RvbS1hY2Nlc3NvciBmb2xsb3dzIHRoaXMgcGF0dGVybi4gVGhpcyBidWcgaXMgdW5j b3ZlcmVkIHdoZW4gdGVzdGluZyBET01KSVQgKFRoaXMgYnVnIGNhdXNlcyBjcmFzaCBhbmQKKyAg ICAgICAgaXQgY2FuIG9jY3VyIGV2ZW4gaWYgd2UgZGlzYWJsZWQgRE9NSklUKS4KKworICAgICAg ICBCdXQgc3VjaCBhIGFzc3VtcHRpb24gaXMgbm90IGd1YXJhbnRlZWQuIEluIHRoaXMgcGF0Y2gs IHdlIGZpeCB0aGlzIGJ5IG5vdCByZXR1cm5pbmcgU2ltcGxlIEdldEJ5SWQuCisKKyAgICAgICAg KiBieXRlY29kZS9HZXRCeUlkU3RhdHVzLmNwcDoKKyAgICAgICAgKEpTQzo6R2V0QnlJZFN0YXR1 czo6Y29tcHV0ZUZyb21MTEludCk6CisgICAgICAgIChKU0M6OkdldEJ5SWRTdGF0dXM6OmNvbXB1 dGVGb3JTdHViSW5mb1dpdGhvdXRFeGl0U2l0ZUZlZWRiYWNrKToKKyAgICAgICAgKEpTQzo6R2V0 QnlJZFN0YXR1czo6Y29tcHV0ZUZvcik6CisKIDIwMTYtMTAtMDUgIFphbiBEb2JlcnNlayAgPHpk b2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbmFtZSBFTkFCTEVfRU5DUllQVEVEX01F RElBX1YyIHRvIEVOQUJMRV9MRUdBQ1lfRU5DUllQVEVEX01FRElBCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5jcHAKaW5kZXggY2I3NmQwNWYwOWYx ODY2NjRhY2IzYmJlMGZjNzg4NjkyZjAxMDgyMy4uMzk0NjZkZDRjZDBlMzJhNzcwNjE3OTMxOTBm MjgwNGZkN2UxNTU2MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0dldEJ5SWRTdGF0dXMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9H ZXRCeUlkU3RhdHVzLmNwcApAQCAtOTcsMTAgKzk3LDEyIEBAIEdldEJ5SWRTdGF0dXMgR2V0QnlJ ZFN0YXR1czo6Y29tcHV0ZUZyb21MTEludChDb2RlQmxvY2sqIHByb2ZpbGVkQmxvY2ssIHVuc2ln bmVkCiAgICAgaWYgKHN0cnVjdHVyZS0+dGFrZXNTbG93UGF0aEluREZHRm9ySW1wdXJlUHJvcGVy dHkoKSkKICAgICAgICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoTm9JbmZvcm1hdGlvbiwgZmFsc2Up OwogCi0gICAgdW5zaWduZWQgYXR0cmlidXRlc0lnbm9yZWQ7Ci0gICAgUHJvcGVydHlPZmZzZXQg b2Zmc2V0ID0gc3RydWN0dXJlLT5nZXRDb25jdXJyZW50bHkodWlkLCBhdHRyaWJ1dGVzSWdub3Jl ZCk7CisgICAgdW5zaWduZWQgYXR0cmlidXRlczsKKyAgICBQcm9wZXJ0eU9mZnNldCBvZmZzZXQg PSBzdHJ1Y3R1cmUtPmdldENvbmN1cnJlbnRseSh1aWQsIGF0dHJpYnV0ZXMpOwogICAgIGlmICgh aXNWYWxpZE9mZnNldChvZmZzZXQpKQogICAgICAgICByZXR1cm4gR2V0QnlJZFN0YXR1cyhOb0lu Zm9ybWF0aW9uLCBmYWxzZSk7CisgICAgaWYgKGF0dHJpYnV0ZXMgJiBDdXN0b21BY2Nlc3NvcikK KyAgICAgICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoTm9JbmZvcm1hdGlvbiwgZmFsc2UpOwogICAg IAogICAgIHJldHVybiBHZXRCeUlkU3RhdHVzKFNpbXBsZSwgZmFsc2UsIEdldEJ5SWRWYXJpYW50 KFN0cnVjdHVyZVNldChzdHJ1Y3R1cmUpLCBvZmZzZXQpKTsKIH0KQEAgLTE3NiwxMSArMTc4LDEz IEBAIEdldEJ5SWRTdGF0dXMgR2V0QnlJZFN0YXR1czo6Y29tcHV0ZUZvclN0dWJJbmZvV2l0aG91 dEV4aXRTaXRlRmVlZGJhY2soCiAgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gc3R1Yklu Zm8tPnUuYnlJZFNlbGYuYmFzZU9iamVjdFN0cnVjdHVyZS5nZXQoKTsKICAgICAgICAgaWYgKHN0 cnVjdHVyZS0+dGFrZXNTbG93UGF0aEluREZHRm9ySW1wdXJlUHJvcGVydHkoKSkKICAgICAgICAg ICAgIHJldHVybiBHZXRCeUlkU3RhdHVzKHNsb3dQYXRoU3RhdGUsIHRydWUpOwotICAgICAgICB1 bnNpZ25lZCBhdHRyaWJ1dGVzSWdub3JlZDsKKyAgICAgICAgdW5zaWduZWQgYXR0cmlidXRlczsK ICAgICAgICAgR2V0QnlJZFZhcmlhbnQgdmFyaWFudDsKLSAgICAgICAgdmFyaWFudC5tX29mZnNl dCA9IHN0cnVjdHVyZS0+Z2V0Q29uY3VycmVudGx5KHVpZCwgYXR0cmlidXRlc0lnbm9yZWQpOwor ICAgICAgICB2YXJpYW50Lm1fb2Zmc2V0ID0gc3RydWN0dXJlLT5nZXRDb25jdXJyZW50bHkodWlk LCBhdHRyaWJ1dGVzKTsKICAgICAgICAgaWYgKCFpc1ZhbGlkT2Zmc2V0KHZhcmlhbnQubV9vZmZz ZXQpKQogICAgICAgICAgICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoc2xvd1BhdGhTdGF0ZSwgdHJ1 ZSk7CisgICAgICAgIGlmIChhdHRyaWJ1dGVzICYgQ3VzdG9tQWNjZXNzb3IpCisgICAgICAgICAg ICByZXR1cm4gR2V0QnlJZFN0YXR1cyhzbG93UGF0aFN0YXRlLCB0cnVlKTsKICAgICAgICAgCiAg ICAgICAgIHZhcmlhbnQubV9zdHJ1Y3R1cmVTZXQuYWRkKHN0cnVjdHVyZSk7CiAgICAgICAgIGJv b2wgZGlkQXBwZW5kID0gcmVzdWx0LmFwcGVuZFZhcmlhbnQodmFyaWFudCk7CkBAIC0zNDMsNiAr MzQ3LDggQEAgR2V0QnlJZFN0YXR1cyBHZXRCeUlkU3RhdHVzOjpjb21wdXRlRm9yKGNvbnN0IFN0 cnVjdHVyZVNldCYgc2V0LCBVbmlxdWVkU3RyaW5nSW0KICAgICAgICAgICAgIHJldHVybiBHZXRC eUlkU3RhdHVzKFRha2VzU2xvd1BhdGgpOyAvLyBJdCdzIHByb2JhYmx5IGEgcHJvdG90eXBlIGxv b2t1cC4gR2l2ZSB1cCBvbiBsaWZlIGZvciBub3csIGV2ZW4gdGhvdWdoIHdlIGNvdWxkIHRvdGFs bHkgYmUgd2F5IHNtYXJ0ZXIgYWJvdXQgaXQuCiAgICAgICAgIGlmIChhdHRyaWJ1dGVzICYgQWNj ZXNzb3IpCiAgICAgICAgICAgICByZXR1cm4gR2V0QnlJZFN0YXR1cyhNYWtlc0NhbGxzKTsgLy8g V2UgY291bGQgYmUgc21hcnRlciBoZXJlLCBsaWtlIHN0cmVuZ3RoLXJlZHVjaW5nIHRoaXMgdG8g YSBDYWxsLgorICAgICAgICBpZiAoYXR0cmlidXRlcyAmIEN1c3RvbUFjY2Vzc29yKQorICAgICAg ICAgICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoVGFrZXNTbG93UGF0aCk7CiAgICAgICAgIAogICAg ICAgICBpZiAoIXJlc3VsdC5hcHBlbmRWYXJpYW50KEdldEJ5SWRWYXJpYW50KHN0cnVjdHVyZSwg b2Zmc2V0KSkpCiAgICAgICAgICAgICByZXR1cm4gR2V0QnlJZFN0YXR1cyhUYWtlc1Nsb3dQYXRo KTsK 290778 2016-10-05 20:48:39 -0700 2016-10-05 21:07:27 -0700 Patch bug-162993-20161006124525.patch text/plain 4336 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2ODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NWRlOGEzMTlkODE3NTQyNGExYjM5OGYyOWJmZWE5OGExOWQ5MGVkLi4xMDhhOWRlNzQ3ODYxMzQz ZWM2MzJmMzMwNzljODc1MDg5YjAyNmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNi0xMC0wNSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBEbyBub3QgY29uc3RydWN0IFNpbXBsZSBHZXRCeUlkU3Rh dHVzIGFnYWluc3Qgc2VsZi1jdXN0b20tYWNjZXNzb3IgY2FzZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYyOTkzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgYWNjaWRlbnRhbGx5IGNyZWF0ZWQgYSBT aW1wbGUgR2V0QnlJZFN0YXR1cyBhZ2FpbnN0IHNlbGYtY3VzdG9tLWFjY2Vzc29yIGNhc2U6IHRo ZSBvYmplY3QgaGFzIG93biBjdXN0b20gYWNjZXNzb3IgcHJvcGVydHkgYW5kIGdldF9ieV9pZCBo aXRzLgorICAgICAgICBJZiB3ZSByZXR1cm5lZCBzdWNoIGEgcmVzdWx0LCB0aGUgR2V0QnlJZCB3 aWxsIGJlIHR1cm5lZCB0byBHZXRCeU9mZnNldCBhbmQgaXQgbG9va3MgdXAgaW5jb3JyZWN0IHRo aW5nIGxpa2UgQ3VzdG9tR2V0dGVyU2V0dGVyIG9iamVjdC4KKyAgICAgICAgV2UgZG8gbm90IGhp dCB0aGlzIGJ1ZyBiZWZvcmUgc2luY2UgbWF5YmUgdGhlcmUgaXMgbm8gb2JqZWN0IHRoYXQgaGFz IG93biBjdXN0b20tYWNjZXNzb3IgYW5kIHRoaXMgY3VzdG9tLWFjY2Vzc29yIGRvZXMgbm90IHJh aXNlIGFuIGVycm9yLgorICAgICAgICBGb3IgZXhhbXBsZSwgIk5vZGUucHJvdG90eXBlIiBoYXMg ImZpcnN0Q2hpbGQiIGN1c3RvbSBhY2Nlc3Nvci4gQnV0IHNpbmNlICJOb2RlLnByb3RvdHlwZSIg aXRzZWxmIGRvZXMgbm90IGhhdmUgTm9kZTo6aW5mbygpLCAiTm9kZS5wcm90b3R5cGUuZmlyc3RD aGlsZCIKKyAgICAgICAgYWNjZXNzIGFsd2F5cyByYWlzZXMgYW4gZXJyb3IuIEkgZ3Vlc3MgYWxs IHRoZSBjdXN0b20gYWNjZXNzb3JzIGZvbGxvdyB0aGlzIHBhdHRlcm4uIFRoaXMgYnVnIGlzIHVu Y292ZXJlZCB3aGVuIHRlc3RpbmcgRE9NSklUIChUaGlzIGJ1ZyBjYXVzZXMgY3Jhc2ggYW5kCisg ICAgICAgIGl0IGNhbiBvY2N1ciBldmVuIGlmIHdlIGRpc2FibGVkIERPTUpJVCkuCisKKyAgICAg ICAgQnV0IHN1Y2ggYSBhc3N1bXB0aW9uIGlzIG5vdCBndWFyYW50ZWVkLiBJbiB0aGlzIHBhdGNo LCB3ZSBmaXggdGhpcyBieSBub3QgcmV0dXJuaW5nIFNpbXBsZSBHZXRCeUlkLgorCisgICAgICAg ICogYnl0ZWNvZGUvR2V0QnlJZFN0YXR1cy5jcHA6CisgICAgICAgIChKU0M6OkdldEJ5SWRTdGF0 dXM6OmNvbXB1dGVGcm9tTExJbnQpOgorICAgICAgICAoSlNDOjpHZXRCeUlkU3RhdHVzOjpjb21w dXRlRm9yU3R1YkluZm9XaXRob3V0RXhpdFNpdGVGZWVkYmFjayk6CisgICAgICAgIChKU0M6Okdl dEJ5SWRTdGF0dXM6OmNvbXB1dGVGb3IpOgorCiAyMDE2LTEwLTA1ICBaYW4gRG9iZXJzZWsgIDx6 ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZW5hbWUgRU5BQkxFX0VOQ1JZUFRFRF9N RURJQV9WMiB0byBFTkFCTEVfTEVHQUNZX0VOQ1JZUFRFRF9NRURJQQpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0dldEJ5SWRTdGF0dXMuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0dldEJ5SWRTdGF0dXMuY3BwCmluZGV4IGNiNzZkMDVmMDlm MTg2NjY0YWNiM2JiZTBmYzc4ODY5MmYwMTA4MjMuLjM5NDY2ZGQ0Y2QwZTMyYTc3MDYxNzkzMTkw ZjI4MDRmZDdlMTU1NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9HZXRCeUlkU3RhdHVzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv R2V0QnlJZFN0YXR1cy5jcHAKQEAgLTk3LDEwICs5NywxMiBAQCBHZXRCeUlkU3RhdHVzIEdldEJ5 SWRTdGF0dXM6OmNvbXB1dGVGcm9tTExJbnQoQ29kZUJsb2NrKiBwcm9maWxlZEJsb2NrLCB1bnNp Z25lZAogICAgIGlmIChzdHJ1Y3R1cmUtPnRha2VzU2xvd1BhdGhJbkRGR0ZvckltcHVyZVByb3Bl cnR5KCkpCiAgICAgICAgIHJldHVybiBHZXRCeUlkU3RhdHVzKE5vSW5mb3JtYXRpb24sIGZhbHNl KTsKIAotICAgIHVuc2lnbmVkIGF0dHJpYnV0ZXNJZ25vcmVkOwotICAgIFByb3BlcnR5T2Zmc2V0 IG9mZnNldCA9IHN0cnVjdHVyZS0+Z2V0Q29uY3VycmVudGx5KHVpZCwgYXR0cmlidXRlc0lnbm9y ZWQpOworICAgIHVuc2lnbmVkIGF0dHJpYnV0ZXM7CisgICAgUHJvcGVydHlPZmZzZXQgb2Zmc2V0 ID0gc3RydWN0dXJlLT5nZXRDb25jdXJyZW50bHkodWlkLCBhdHRyaWJ1dGVzKTsKICAgICBpZiAo IWlzVmFsaWRPZmZzZXQob2Zmc2V0KSkKICAgICAgICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoTm9J bmZvcm1hdGlvbiwgZmFsc2UpOworICAgIGlmIChhdHRyaWJ1dGVzICYgQ3VzdG9tQWNjZXNzb3Ip CisgICAgICAgIHJldHVybiBHZXRCeUlkU3RhdHVzKE5vSW5mb3JtYXRpb24sIGZhbHNlKTsKICAg ICAKICAgICByZXR1cm4gR2V0QnlJZFN0YXR1cyhTaW1wbGUsIGZhbHNlLCBHZXRCeUlkVmFyaWFu dChTdHJ1Y3R1cmVTZXQoc3RydWN0dXJlKSwgb2Zmc2V0KSk7CiB9CkBAIC0xNzYsMTEgKzE3OCwx MyBAQCBHZXRCeUlkU3RhdHVzIEdldEJ5SWRTdGF0dXM6OmNvbXB1dGVGb3JTdHViSW5mb1dpdGhv dXRFeGl0U2l0ZUZlZWRiYWNrKAogICAgICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IHN0dWJJ bmZvLT51LmJ5SWRTZWxmLmJhc2VPYmplY3RTdHJ1Y3R1cmUuZ2V0KCk7CiAgICAgICAgIGlmIChz dHJ1Y3R1cmUtPnRha2VzU2xvd1BhdGhJbkRGR0ZvckltcHVyZVByb3BlcnR5KCkpCiAgICAgICAg ICAgICByZXR1cm4gR2V0QnlJZFN0YXR1cyhzbG93UGF0aFN0YXRlLCB0cnVlKTsKLSAgICAgICAg dW5zaWduZWQgYXR0cmlidXRlc0lnbm9yZWQ7CisgICAgICAgIHVuc2lnbmVkIGF0dHJpYnV0ZXM7 CiAgICAgICAgIEdldEJ5SWRWYXJpYW50IHZhcmlhbnQ7Ci0gICAgICAgIHZhcmlhbnQubV9vZmZz ZXQgPSBzdHJ1Y3R1cmUtPmdldENvbmN1cnJlbnRseSh1aWQsIGF0dHJpYnV0ZXNJZ25vcmVkKTsK KyAgICAgICAgdmFyaWFudC5tX29mZnNldCA9IHN0cnVjdHVyZS0+Z2V0Q29uY3VycmVudGx5KHVp ZCwgYXR0cmlidXRlcyk7CiAgICAgICAgIGlmICghaXNWYWxpZE9mZnNldCh2YXJpYW50Lm1fb2Zm c2V0KSkKICAgICAgICAgICAgIHJldHVybiBHZXRCeUlkU3RhdHVzKHNsb3dQYXRoU3RhdGUsIHRy dWUpOworICAgICAgICBpZiAoYXR0cmlidXRlcyAmIEN1c3RvbUFjY2Vzc29yKQorICAgICAgICAg ICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoc2xvd1BhdGhTdGF0ZSwgdHJ1ZSk7CiAgICAgICAgIAog ICAgICAgICB2YXJpYW50Lm1fc3RydWN0dXJlU2V0LmFkZChzdHJ1Y3R1cmUpOwogICAgICAgICBi b29sIGRpZEFwcGVuZCA9IHJlc3VsdC5hcHBlbmRWYXJpYW50KHZhcmlhbnQpOwpAQCAtMzQzLDYg KzM0Nyw4IEBAIEdldEJ5SWRTdGF0dXMgR2V0QnlJZFN0YXR1czo6Y29tcHV0ZUZvcihjb25zdCBT dHJ1Y3R1cmVTZXQmIHNldCwgVW5pcXVlZFN0cmluZ0ltCiAgICAgICAgICAgICByZXR1cm4gR2V0 QnlJZFN0YXR1cyhUYWtlc1Nsb3dQYXRoKTsgLy8gSXQncyBwcm9iYWJseSBhIHByb3RvdHlwZSBs b29rdXAuIEdpdmUgdXAgb24gbGlmZSBmb3Igbm93LCBldmVuIHRob3VnaCB3ZSBjb3VsZCB0b3Rh bGx5IGJlIHdheSBzbWFydGVyIGFib3V0IGl0LgogICAgICAgICBpZiAoYXR0cmlidXRlcyAmIEFj Y2Vzc29yKQogICAgICAgICAgICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoTWFrZXNDYWxscyk7IC8v IFdlIGNvdWxkIGJlIHNtYXJ0ZXIgaGVyZSwgbGlrZSBzdHJlbmd0aC1yZWR1Y2luZyB0aGlzIHRv IGEgQ2FsbC4KKyAgICAgICAgaWYgKGF0dHJpYnV0ZXMgJiBDdXN0b21BY2Nlc3NvcikKKyAgICAg ICAgICAgIHJldHVybiBHZXRCeUlkU3RhdHVzKFRha2VzU2xvd1BhdGgpOwogICAgICAgICAKICAg ICAgICAgaWYgKCFyZXN1bHQuYXBwZW5kVmFyaWFudChHZXRCeUlkVmFyaWFudChzdHJ1Y3R1cmUs IG9mZnNldCkpKQogICAgICAgICAgICAgcmV0dXJuIEdldEJ5SWRTdGF0dXMoVGFrZXNTbG93UGF0 aCk7Cg==