74837 2011-12-18 22:11:20 -0800 REGRESSION(r101445): [JSC] Generated code for custom getters and setters with the [Supplemental] IDL is wrong 2011-12-18 23:16:21 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74599 1 haraken haraken abarth darin japhet sam webkit.review.bot oldest_to_newest 523719 0 haraken 2011-12-18 22:11:20 -0800 In bug 73162, we implemented the [Supplemental] IDL, but the generated code for custom getters and setters is wrong in JSC. In WebCore/bindings/scripts/test/JS/JSTestInterface.cpp, Wrong: JSValue jsTestInterfaceStr3(ExecState* exec, JSValue slotBase, const Identifier&) { JSTestInterface* castedThis = static_cast<JSTestInterface*>(asObject(slotBase)); return JSTestSupplemental::str3(castedThis, exec); } Correct: JSValue jsTestInterfaceStr3(ExecState* exec, JSValue slotBase, const Identifier&) { JSTestInterface* castedThis = static_cast<JSTestInterface*>(asObject(slotBase)); TestInterface* imp = static_cast<TestInterface*>(castedThis->impl()); return castedThis->str3(imp, exec); } 523723 1 119814 haraken 2011-12-18 22:22:02 -0800 Created attachment 119814 Patch 523726 2 119814 darin 2011-12-18 22:25:00 -0800 Comment on attachment 119814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119814&action=review > Source/WebCore/ChangeLog:25 > + TestInterface* imp = static_cast<TestInterface*>(castedThis->impl()); > + return castedThis->str3(imp, exec); Why both imp and impl? How about just using one abbreviation in both places. 523734 3 haraken 2011-12-18 22:33:19 -0800 (In reply to comment #2) > (From update of attachment 119814 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=119814&action=review > > > Source/WebCore/ChangeLog:25 > > + TestInterface* imp = static_cast<TestInterface*>(castedThis->impl()); > > + return castedThis->str3(imp, exec); > > Why both imp and impl? How about just using one abbreviation in both places. Darin: Yeah, we should unify their names. Since we cannot rename castedThis->impl() easily, we should rename 'imp' to 'impl'. But it appears that there are already so many 'imp' in CodeGeneratorJS.pm. Is it OK to rename it in another patch? 523741 4 119814 darin 2011-12-18 22:47:54 -0800 Comment on attachment 119814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119814&action=review >>> Source/WebCore/ChangeLog:25 >>> + return castedThis->str3(imp, exec); >> >> Why both imp and impl? How about just using one abbreviation in both places. > > Darin: Yeah, we should unify their names. Since we cannot rename castedThis->impl() easily, we should rename 'imp' to 'impl'. But it appears that there are already so many 'imp' in CodeGeneratorJS.pm. Is it OK to rename it in another patch? To me it looked like the new imp was entirely new and easy to change to impl before it even landed. But if you’d like to do that in another patch along with changes to lots of existing cases of imp too it’s OK with me. 523742 5 haraken 2011-12-18 22:51:16 -0800 (In reply to comment #4) > (From update of attachment 119814 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=119814&action=review > To me it looked like the new imp was entirely new and easy to change to impl before it even landed. But if you’d like to do that in another patch along with changes to lots of existing cases of imp too it’s OK with me. Darin: Thanks, I'll rename them all at once in the next patch. 523760 6 119814 webkit.review.bot 2011-12-18 23:16:17 -0800 Comment on attachment 119814 Patch Clearing flags on attachment: 119814 Committed r103221: <http://trac.webkit.org/changeset/103221> 523761 7 webkit.review.bot 2011-12-18 23:16:21 -0800 All reviewed patches have been landed. Closing bug. 119814 2011-12-18 22:22:02 -0800 2011-12-18 23:16:17 -0800 Patch bug-74837-20111219152200.patch text/plain 10744 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODYxOTcxMmU5NDU1ZmQw ZDA3M2RmYTllZDY0ZGRiYjg3NTRkY2I2MS4uZDEzNGU1MWYwMThmNmU0ZWViNjNlOTIzOTA5YmEy MDhhNDBkMGNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDExLTEyLTE4ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHIx MDE0NDUpOiBbSlNDXSBHZW5lcmF0ZWQgY29kZSBmb3IgY3VzdG9tIGdldHRlcnMgYW5kIHNldHRl cnMKKyAgICAgICAgd2l0aCB0aGUgW1N1cHBsZW1lbnRhbF0gSURMIGlzIHdyb25nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDgzNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGJ1ZyA3MzE2Miwgd2Ug aW1wbGVtZW50ZWQgdGhlIFtTdXBwbGVtZW50YWxdIElETCwgYnV0IHRoZSBnZW5lcmF0ZWQgY29k ZQorICAgICAgICBmb3IgY3VzdG9tIGdldHRlcnMgYW5kIHNldHRlcnMgd2FzIHdyb25nIGluIEpT Qy4gVGhpcyBwYXRjaCBmaXhlcyBDb2RlR2VuZXJhdG9ySlMucG0KKyAgICAgICAgc28gdGhhdCB0 aGUgcmVzdWx0IG9mIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RJbnRlcmZhY2Uu aWRsIGJlY29tZXMgYXMgZm9sbG93czoKKworICAgICAgICBXcm9uZzoKKyAgICAgICAgICAgIEpT VmFsdWUganNUZXN0SW50ZXJmYWNlU3RyMyhFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJh c2UsIGNvbnN0IElkZW50aWZpZXImKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIEpT VGVzdEludGVyZmFjZSogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdEludGVyZmFjZSo+ KGFzT2JqZWN0KHNsb3RCYXNlKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIEpTVGVzdFN1cHBs ZW1lbnRhbDo6c3RyMyhjYXN0ZWRUaGlzLCBleGVjKTsKKyAgICAgICAgICAgIH0KKworICAgICAg ICBDb3JyZWN0OgorICAgICAgICAgICAgSlNWYWx1ZSBqc1Rlc3RJbnRlcmZhY2VTdHIzKEV4ZWNT dGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnRpZmllciYpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgSlNUZXN0SW50ZXJmYWNlKiBjYXN0ZWRUaGlzID0gc3Rh dGljX2Nhc3Q8SlNUZXN0SW50ZXJmYWNlKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKKyAgICAgICAg ICAgICAgICBUZXN0SW50ZXJmYWNlKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0SW50ZXJmYWNlKj4o Y2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gY2FzdGVkVGhpcy0+ c3RyMyhpbXAsIGV4ZWMpOworICAgICAgICAgICAgfQorCisgICAgICAgIFRlc3RzOiBiaW5kaW5n cy9zY3JpcHRzL3Rlc3QvSlMvVGVzdEludGVyZmFjZS5pZGwKKworICAgICAgICAqIGJpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVIZWFkZXIpOgor ICAgICAgICAoR2VuZXJhdGVJbXBsZW1lbnRhdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L0pTL0pTVGVzdEludGVyZmFjZS5jcHA6IFVwZGF0ZWQgcnVuLWJpbmRpbmdzLXRl c3RzIHJlc3VsdC4KKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdEludGVyZmFjZVN0cjMpOgorICAg ICAgICAoV2ViQ29yZTo6c2V0SlNUZXN0SW50ZXJmYWNlU3RyMyk6CisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEludGVyZmFjZS5oOiBEaXR0by4KKwogMjAxMS0xMi0x OCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczOTU0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbSBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCmluZGV4IDgzOGI4NGY1NWJj MmFiMWQ2MTIxNGJlMzM3ODM4YmJmYmFkZTliMWIuLmVjNTFjMTA1ZTUyZDA2ZmE5ZDQxYjJiZjVj Y2JkMWI2Y2QzYmQ5ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckpTLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckpTLnBtCkBAIC04NzUsOCArODc1LDggQEAgc3ViIEdlbmVyYXRlSGVh ZGVyCiAgICAgICAgIGZvcmVhY2ggKEB7JGRhdGFOb2RlLT5hdHRyaWJ1dGVzfSkgewogICAgICAg ICAgICAgbXkgJGF0dHJpYnV0ZSA9ICRfOwogICAgICAgICAgICAgJG51bUN1c3RvbUF0dHJpYnV0 ZXMrKyBpZiAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0 b20ifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0ND dXN0b20ifTsKLSAgICAgICAgICAgICRudW1DdXN0b21BdHRyaWJ1dGVzKysgaWYgKCRhdHRyaWJ1 dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3RvbUdldHRlciJ9IHx8ICRh dHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkpTQ0N1c3RvbUdldHRl ciJ9KSAmJiAhJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiSW1w bGVtZW50ZWRCeSJ9OwotICAgICAgICAgICAgJG51bUN1c3RvbUF0dHJpYnV0ZXMrKyBpZiAoJGF0 dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tU2V0dGVyIn0g fHwgJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiSlNDQ3VzdG9t U2V0dGVyIn0pICYmICEkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+ eyJJbXBsZW1lbnRlZEJ5In07CisgICAgICAgICAgICAkbnVtQ3VzdG9tQXR0cmlidXRlcysrIGlm ICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21HZXR0 ZXIifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0ND dXN0b21HZXR0ZXIifSk7CisgICAgICAgICAgICAkbnVtQ3VzdG9tQXR0cmlidXRlcysrIGlmICgk YXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21TZXR0ZXIi fSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0 b21TZXR0ZXIifSk7CiAgICAgICAgICAgICBpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiQ2FjaGVkQXR0cmlidXRlIn0pIHsKICAgICAgICAgICAgICAgICBw dXNoKEBoZWFkZXJDb250ZW50LCAiICAgIEpTQzo6V3JpdGVCYXJyaWVyPEpTQzo6VW5rbm93bj4g bV8iIC4gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1lIC4gIjtcbiIpOwogICAgICAgICAgICAg ICAgICRudW1DYWNoZWRBdHRyaWJ1dGVzKys7CkBAIC05MDAsMTEgKzkwMCwyMCBAQCBzdWIgR2Vu ZXJhdGVIZWFkZXIKICAgICAgICAgICAgICAgICBpZiAoJGF0dHJpYnV0ZS0+dHlwZSAhfiAvXnJl YWRvbmx5LykgewogICAgICAgICAgICAgICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAg IHZvaWQgc2V0IiAuICRjb2RlR2VuZXJhdG9yLT5XS191Y2ZpcnN0KCRhdHRyaWJ1dGUtPnNpZ25h dHVyZS0+bmFtZSkgLiAiKEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlKTtcbiIpOwogICAg ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzaWYgKCgkYXR0cmlidXRlLT5zaWduYXR1 cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21HZXR0ZXIifSB8fCAkYXR0cmlidXRlLT5z aWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b21HZXR0ZXIifSkgJiYgISRh dHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkltcGxlbWVudGVkQnki fSkgewotICAgICAgICAgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAgSlNDOjpKU1Zh bHVlICIgLiAkY29kZUdlbmVyYXRvci0+V0tfbGNmaXJzdCgkYXR0cmlidXRlLT5zaWduYXR1cmUt Pm5hbWUpIC4gIihKU0M6OkV4ZWNTdGF0ZSopIGNvbnN0O1xuIik7Ci0gICAgICAgICAgICB9IGVs c2lmICgoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9t U2V0dGVyIn0gfHwgJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi SlNDQ3VzdG9tU2V0dGVyIn0pICYmICEkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0 cmlidXRlcy0+eyJJbXBsZW1lbnRlZEJ5In0pIHsKKyAgICAgICAgICAgIH0gZWxzaWYgKCgkYXR0 cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21HZXR0ZXIifSB8 fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b21H ZXR0ZXIifSkpIHsKKyAgICAgICAgICAgICAgICBteSAkbWV0aG9kTmFtZSA9ICRjb2RlR2VuZXJh dG9yLT5XS19sY2ZpcnN0KCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+bmFtZSk7CisgICAgICAgICAg ICAgICAgaWYgKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Iklt cGxlbWVudGVkQnkifSkgeworICAgICAgICAgICAgICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50 LCAiICAgIEpTQzo6SlNWYWx1ZSAiIC4gJG1ldGhvZE5hbWUgLiAiKCIgLiAkaW50ZXJmYWNlTmFt ZSAuICIqLCBKU0M6OkV4ZWNTdGF0ZSopIGNvbnN0O1xuIik7CisgICAgICAgICAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICBKU0M6 OkpTVmFsdWUgIiAuICRtZXRob2ROYW1lIC4gIihKU0M6OkV4ZWNTdGF0ZSopIGNvbnN0O1xuIik7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSBlbHNpZiAoKCRhdHRyaWJ1dGUtPnNp Z25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3RvbVNldHRlciJ9IHx8ICRhdHRyaWJ1 dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkpTQ0N1c3RvbVNldHRlciJ9KSkg ewogICAgICAgICAgICAgICAgIGlmICgkYXR0cmlidXRlLT50eXBlICF+IC9ecmVhZG9ubHkvKSB7 Ci0gICAgICAgICAgICAgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAgdm9pZCBzZXQi IC4gJGNvZGVHZW5lcmF0b3ItPldLX3VjZmlyc3QoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1l KSAuICIoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUpO1xuIik7CisgICAgICAgICAgICAg ICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJ bXBsZW1lbnRlZEJ5In0pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGhlYWRlckNv bnRlbnQsICIgICAgdm9pZCBzZXQiIC4gJGNvZGVHZW5lcmF0b3ItPldLX3VjZmlyc3QoJGF0dHJp YnV0ZS0+c2lnbmF0dXJlLT5uYW1lKSAuICIoIiAuICRpbnRlcmZhY2VOYW1lIC4gIiosIEpTQzo6 RXhlY1N0YXRlKiwgSlNDOjpKU1ZhbHVlKTtcbiIpOworICAgICAgICAgICAgICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICB2 b2lkIHNldCIgLiAkY29kZUdlbmVyYXRvci0+V0tfdWNmaXJzdCgkYXR0cmlidXRlLT5zaWduYXR1 cmUtPm5hbWUpIC4gIihKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSk7XG4iKTsKKyAgICAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAg ICAgfQpAQCAtMTcxNiw5ICsxNzI1LDggQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KIAog ICAgICAgICAgICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJKU0NDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0 cmlidXRlcy0+eyJDdXN0b21HZXR0ZXIifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVu ZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b21HZXR0ZXIifSkgewogICAgICAgICAgICAgICAgICAg ICBpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiSW1wbGVt ZW50ZWRCeSJ9KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBteSAkaW1wbGVtZW50ZWRCeSA9 ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkltcGxlbWVudGVk QnkifTsKLSAgICAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IkpTJHtpbXBsZW1l bnRlZEJ5fS5oIn0gPSAxOwotICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIgICAgcmV0dXJuIEpTJHtpbXBsZW1lbnRlZEJ5fTo6JGltcGxHZXR0ZXJGdW5jdGlvbk5h bWUoY2FzdGVkVGhpcywgZXhlYyk7XG4iKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiICAgICR7aW50ZXJmYWNlTmFtZX0qIGltcCA9IHN0YXRpY19jYXN0PCR7 aW50ZXJmYWNlTmFtZX0qPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7CisgICAgICAgICAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gY2FzdGVkVGhpcy0+JGlt cGxHZXR0ZXJGdW5jdGlvbk5hbWUoaW1wLCBleGVjKTtcbiIpOwogICAgICAgICAgICAgICAgICAg ICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIg ICAgcmV0dXJuIGNhc3RlZFRoaXMtPiRpbXBsR2V0dGVyRnVuY3Rpb25OYW1lKGV4ZWMpO1xuIik7 CiAgICAgICAgICAgICAgICAgICAgIH0KQEAgLTE5MDUsOSArMTkxMyw5IEBAIHN1YiBHZW5lcmF0 ZUltcGxlbWVudGF0aW9uCiAKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkYXR0cmlidXRl LT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b20ifSB8fCAkYXR0cmlidXRl LT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b20ifSB8fCAkYXR0cmli dXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21TZXR0ZXIifSB8fCAk YXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b21TZXR0 ZXIifSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWdu YXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJbXBsZW1lbnRlZEJ5In0pIHsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbXkgJGltcGxlbWVudGVkQnkgPSAkYXR0cmlidXRlLT5z aWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJbXBsZW1lbnRlZEJ5In07Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IkpTJHtpbXBsZW1lbnRlZEJ5 fS5oIn0gPSAxOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICBKUyR7aW1wbGVtZW50ZWRCeX06OnNldCRpbXBsU2V0dGVyRnVuY3Rpb25OYW1l KHN0YXRpY19jYXN0PCRjbGFzc05hbWUqPih0aGlzT2JqZWN0KSwgZXhlYywgdmFsdWUpO1xuIik7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAg ICR7Y2xhc3NOYW1lfSogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PCR7Y2xhc3NOYW1lfSo+KHRo aXNPYmplY3QpO1xuIik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50LCAiICAgICR7aW50ZXJmYWNlTmFtZX0qIGltcCA9IHN0YXRpY19jYXN0PCR7aW50 ZXJmYWNlTmFtZX0qPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGNhc3RlZFRoaXMtPnNldCRp bXBsU2V0dGVyRnVuY3Rpb25OYW1lKGltcCwgZXhlYywgdmFsdWUpO1xuIik7CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgc3RhdGljX2Nhc3Q8JGNsYXNzTmFtZSo+KHRoaXNP YmplY3QpLT5zZXQkaW1wbFNldHRlckZ1bmN0aW9uTmFtZShleGVjLCB2YWx1ZSk7XG4iKTsKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0SW50ZXJmYWNlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJbnRlcmZhY2UuY3BwCmluZGV4IGJh MjJiOWYyNTQ2ODUxM2JjM2JkYTc4ZGFmY2FhYzJhZjA5Yjc0ZWYuLmRhYzI5Mjg4MzA1OGY5ZDI4 ZGE3OTdmYzVmNDk5MmI1NzdlN2M0NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJbnRlcmZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJbnRlcmZhY2UuY3BwCkBAIC0yNiw3 ICsyNiw2IEBACiAKICNpbmNsdWRlICJFeGNlcHRpb25Db2RlLmgiCiAjaW5jbHVkZSAiSlNET01C aW5kaW5nLmgiCi0jaW5jbHVkZSAiSlNUZXN0U3VwcGxlbWVudGFsLmgiCiAjaW5jbHVkZSAiVGVz dEludGVyZmFjZS5oIgogI2luY2x1ZGUgIlRlc3RTdXBwbGVtZW50YWwuaCIKICNpbmNsdWRlIDxy dW50aW1lL0Vycm9yLmg+CkBAIC0yMDEsNyArMjAwLDggQEAgSlNWYWx1ZSBqc1Rlc3RJbnRlcmZh Y2VTdHIyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnRpZmll ciYKIEpTVmFsdWUganNUZXN0SW50ZXJmYWNlU3RyMyhFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUg c2xvdEJhc2UsIGNvbnN0IElkZW50aWZpZXImKQogewogICAgIEpTVGVzdEludGVyZmFjZSogY2Fz dGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdEludGVyZmFjZSo+KGFzT2JqZWN0KHNsb3RCYXNl KSk7Ci0gICAgcmV0dXJuIEpTVGVzdFN1cHBsZW1lbnRhbDo6c3RyMyhjYXN0ZWRUaGlzLCBleGVj KTsKKyAgICBUZXN0SW50ZXJmYWNlKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0SW50ZXJmYWNlKj4o Y2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICByZXR1cm4gY2FzdGVkVGhpcy0+c3RyMyhpbXAsIGV4 ZWMpOwogfQogCiAjZW5kaWYKQEAgLTIzMiw3ICsyMzIsOSBAQCB2b2lkIHNldEpTVGVzdEludGVy ZmFjZVN0cjIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iamVjdCwgSlNWYWx1ZSB2 YWx1ZQogI2lmIEVOQUJMRShDb25kaXRpb24xMSkgfHwgRU5BQkxFKENvbmRpdGlvbjEyKQogdm9p ZCBzZXRKU1Rlc3RJbnRlcmZhY2VTdHIzKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNP YmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7Ci0gICAgSlNUZXN0U3VwcGxlbWVudGFsOjpzZXRTdHIz KHN0YXRpY19jYXN0PEpTVGVzdEludGVyZmFjZSo+KHRoaXNPYmplY3QpLCBleGVjLCB2YWx1ZSk7 CisgICAgSlNUZXN0SW50ZXJmYWNlKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0SW50 ZXJmYWNlKj4odGhpc09iamVjdCk7CisgICAgVGVzdEludGVyZmFjZSogaW1wID0gc3RhdGljX2Nh c3Q8VGVzdEludGVyZmFjZSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgY2FzdGVkVGhpcy0+ c2V0U3RyMyhpbXAsIGV4ZWMsIHZhbHVlKTsKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0SW50ZXJmYWNlLmggYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0SW50ZXJmYWNlLmgK aW5kZXggNWU1ZDM1NzE2NTc2YmUzMDE5YTkzMjdkN2ZmZjI2ZTZmYTM5YjJlNi4uYjRkMzEzNjVi YmIyMWM3MDY4MTUwY2QwMGIwY2E1OThmYzQ5N2Y4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEludGVyZmFjZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJbnRlcmZhY2UuaApAQCAt NTMsNiArNTMsOSBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgc3RhdGljIEpTQzo6SlNWYWx1ZSBn ZXRDb25zdHJ1Y3RvcihKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNHbG9iYWxPYmplY3QqKTsKKwor ICAgIC8vIEN1c3RvbSBhdHRyaWJ1dGVzCisgICAgSlNDOjpKU1ZhbHVlIHN0cjMoVGVzdEludGVy ZmFjZSosIEpTQzo6RXhlY1N0YXRlKikgY29uc3Q7CiAgICAgVGVzdEludGVyZmFjZSogaW1wbCgp IGNvbnN0IHsgcmV0dXJuIG1faW1wbDsgfQogICAgIHZvaWQgcmVsZWFzZUltcGwoKSB7IG1faW1w bC0+ZGVyZWYoKTsgbV9pbXBsID0gMDsgfQogCg==