141727 2015-02-17 14:47:04 -0800 Set the semantic origin of delayed SetLocal to the Bytecode that originated it 2015-02-23 19:33:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin fpizlo oldest_to_newest 1069957 0 benjamin 2015-02-17 14:47:04 -0800 Set the semantic origin of delayed SetLocal to the Bytecode that originated it 1069961 1 246771 benjamin 2015-02-17 14:54:09 -0800 Created attachment 246771 Patch 1070052 2 246771 fpizlo 2015-02-17 23:00:32 -0800 Comment on attachment 246771 Patch This makes sense! r=me. 1071499 3 246771 benjamin 2015-02-23 19:33:13 -0800 Comment on attachment 246771 Patch Clearing flags on attachment: 246771 Committed r180546: <http://trac.webkit.org/changeset/180546> 1071500 4 benjamin 2015-02-23 19:33:16 -0800 All reviewed patches have been landed. Closing bug. 246771 2015-02-17 14:54:09 -0800 2015-02-23 19:33:13 -0800 Patch bug-141727-20150217145403.patch text/plain 9177 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 M2RiZTRiNGNiN2Y1OGYyYjFjMjc0ZmE3MTRhNzBiNjE0OGMxZjRiLi4wZTUzNjY2YTM4N2Y2NWIw ZmYyZDEzNTUwNmNkYWUxYTE0MjNhYTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxNS0wMi0xNyAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxl LmNvbT4KKworICAgICAgICBTZXQgdGhlIHNlbWFudGljIG9yaWdpbiBvZiBkZWxheWVkIFNldExv Y2FsIHRvIHRoZSBCeXRlY29kZSB0aGF0IG9yaWdpbmF0ZWQgaXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTcyNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHksIGRlbGF5ZWQgU2V0TG9j YWxzIHdvdWxkIGhhdmUgdGhlIE5vZGVPcmlnaW4gb2YgdGhlIG5leHQKKyAgICAgICAgYnl0ZWNv ZGUuIFRoaXMgd2FzIGJlY2F1c2UgZGVsYXllZCBTZXRMb2NhbCBhcmUuLi5kZWxheWVkLi4uIGFu ZAorICAgICAgICBjdXJyZW50Q29kZU9yaWdpbigpIGlzIHRoZSBvbmUgd2hlcmUgdGhlIG5vZGUg aXMgZW1pdHRlZC4KKworICAgICAgICBUaGlzIG1hZGUgZGVidWdnaW5nIGEgbGl0dGxlIGF3a3dh cmQgc2luY2UgdGhlIE9TUiBleGl0cyBvbiBTZXRMb2NhbAorICAgICAgICB3ZXJlIHJlcG9ydGVk IGZvciB0aGUgbmV4dCBieXRlY29kZS4gVGhpcyBwYXRjaCBjaGFuZ2VzIHRoZSBzZW1hbnRpYwor ICAgICAgICBvcmlnaW4gdG8ga2VlcCB0aGUgb3JpZ2luYWwgYnl0ZWNvZGUuCisKKyAgICAgICAg RnJvbSBiZW5jaG1hcmtzLCB0aGlzIGxvb2tzIGxpa2UgaXQgY291bGQgYmUgYSB0aW55IGJpdCBm YXN0ZXIKKyAgICAgICAgYnV0IGl0IGxpa2VseSBqdXN0IG5vaXNlLgorCisgICAgICAgICogZGZn L0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNl cjo6c2V0RGlyZWN0KToKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6c2V0TG9j YWwpOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpzZXRBcmd1bWVudCk6Cisg ICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OmN1cnJlbnROb2RlT3JpZ2luKToKKyAg ICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6YWRkVG9HcmFwaCk6CisgICAgICAgIChK U0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OkRlbGF5ZWRTZXRMb2NhbDo6RGVsYXllZFNldExvY2Fs KToKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6RGVsYXllZFNldExvY2FsOjpl eGVjdXRlKToKKwogMjAxNS0wMi0xNSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAg ICAgICAgIEFkZCBleHBlcmltZW50YWwgPGF0dGFjaG1lbnQ+IGVsZW1lbnQgc3VwcG9ydApkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAppbmRleCA4 NWUyYTFjNzJlNTRjNDEyZjk5YTQ3YTViNGZjN2NmMDE0ZmJkMjE1Li42OTQ0NTFmNDZmNTdhYzQ2 MzliM2YzZTJiOTkzOTk2ZmEzNGJiNjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcApAQCAtMjk1LDggKzI5NSw4IEBAIHByaXZhdGU6CiAg ICAgTm9kZSogc2V0RGlyZWN0KFZpcnR1YWxSZWdpc3RlciBvcGVyYW5kLCBOb2RlKiB2YWx1ZSwg U2V0TW9kZSBzZXRNb2RlID0gTm9ybWFsU2V0KQogICAgIHsKICAgICAgICAgYWRkVG9HcmFwaChN b3ZIaW50LCBPcEluZm8ob3BlcmFuZC5vZmZzZXQoKSksIHZhbHVlKTsKLSAgICAgICAgCi0gICAg ICAgIERlbGF5ZWRTZXRMb2NhbCBkZWxheWVkID0gRGVsYXllZFNldExvY2FsKG9wZXJhbmQsIHZh bHVlKTsKKworICAgICAgICBEZWxheWVkU2V0TG9jYWwgZGVsYXllZChjdXJyZW50Q29kZU9yaWdp bigpLCBvcGVyYW5kLCB2YWx1ZSk7CiAgICAgICAgIAogICAgICAgICBpZiAoc2V0TW9kZSA9PSBO b3JtYWxTZXQpIHsKICAgICAgICAgICAgIG1fc2V0TG9jYWxRdWV1ZS5hcHBlbmQoZGVsYXllZCk7 CkBAIC0zNzcsOCArMzc3LDExIEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBub2RlOwogICAg IH0KIAotICAgIE5vZGUqIHNldExvY2FsKFZpcnR1YWxSZWdpc3RlciBvcGVyYW5kLCBOb2RlKiB2 YWx1ZSwgU2V0TW9kZSBzZXRNb2RlID0gTm9ybWFsU2V0KQorICAgIE5vZGUqIHNldExvY2FsKGNv bnN0IENvZGVPcmlnaW4mIHNlbWFudGljT3JpZ2luLCBWaXJ0dWFsUmVnaXN0ZXIgb3BlcmFuZCwg Tm9kZSogdmFsdWUsIFNldE1vZGUgc2V0TW9kZSA9IE5vcm1hbFNldCkKICAgICB7CisgICAgICAg IENvZGVPcmlnaW4gb2xkU2VtYW50aWNPcmlnaW4gPSBtX2N1cnJlbnRTZW1hbnRpY09yaWdpbjsK KyAgICAgICAgbV9jdXJyZW50U2VtYW50aWNPcmlnaW4gPSBzZW1hbnRpY09yaWdpbjsKKwogICAg ICAgICB1bnNpZ25lZCBsb2NhbCA9IG9wZXJhbmQudG9Mb2NhbCgpOwogICAgICAgICBib29sIGlz Q2FwdHVyZWQgPSBtX2NvZGVCbG9jay0+aXNDYXB0dXJlZChvcGVyYW5kLCBpbmxpbmVDYWxsRnJh bWUoKSk7CiAgICAgICAgIApAQCAtMzkwLDExICszOTMsMTMgQEAgcHJpdmF0ZToKIAogICAgICAg ICBWYXJpYWJsZUFjY2Vzc0RhdGEqIHZhcmlhYmxlQWNjZXNzRGF0YSA9IG5ld1ZhcmlhYmxlQWNj ZXNzRGF0YShvcGVyYW5kLCBpc0NhcHR1cmVkKTsKICAgICAgICAgdmFyaWFibGVBY2Nlc3NEYXRh LT5tZXJnZVN0cnVjdHVyZUNoZWNrSG9pc3RpbmdGYWlsZWQoCi0gICAgICAgICAgICBtX2lubGlu ZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRD YWNoZSkpOworICAgICAgICAgICAgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5oYXNF eGl0U2l0ZShzZW1hbnRpY09yaWdpbi5ieXRlY29kZUluZGV4LCBCYWRDYWNoZSkpOwogICAgICAg ICB2YXJpYWJsZUFjY2Vzc0RhdGEtPm1lcmdlQ2hlY2tBcnJheUhvaXN0aW5nRmFpbGVkKAotICAg ICAgICAgICAgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1 cnJlbnRJbmRleCwgQmFkSW5kZXhpbmdUeXBlKSk7CisgICAgICAgICAgICBtX2lubGluZVN0YWNr VG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKHNlbWFudGljT3JpZ2luLmJ5dGVjb2RlSW5k ZXgsIEJhZEluZGV4aW5nVHlwZSkpOwogICAgICAgICBOb2RlKiBub2RlID0gYWRkVG9HcmFwaChT ZXRMb2NhbCwgT3BJbmZvKHZhcmlhYmxlQWNjZXNzRGF0YSksIHZhbHVlKTsKICAgICAgICAgbV9j dXJyZW50QmxvY2stPnZhcmlhYmxlc0F0VGFpbC5sb2NhbChsb2NhbCkgPSBub2RlOworCisgICAg ICAgIG1fY3VycmVudFNlbWFudGljT3JpZ2luID0gb2xkU2VtYW50aWNPcmlnaW47CiAgICAgICAg IHJldHVybiBub2RlOwogICAgIH0KIApAQCAtNDMwLDggKzQzNSwxMSBAQCBwcml2YXRlOgogICAg ICAgICBtX2N1cnJlbnRCbG9jay0+dmFyaWFibGVzQXRUYWlsLmFyZ3VtZW50KGFyZ3VtZW50KSA9 IG5vZGU7CiAgICAgICAgIHJldHVybiBub2RlOwogICAgIH0KLSAgICBOb2RlKiBzZXRBcmd1bWVu dChWaXJ0dWFsUmVnaXN0ZXIgb3BlcmFuZCwgTm9kZSogdmFsdWUsIFNldE1vZGUgc2V0TW9kZSA9 IE5vcm1hbFNldCkKKyAgICBOb2RlKiBzZXRBcmd1bWVudChjb25zdCBDb2RlT3JpZ2luJiBzZW1h bnRpY09yaWdpbiwgVmlydHVhbFJlZ2lzdGVyIG9wZXJhbmQsIE5vZGUqIHZhbHVlLCBTZXRNb2Rl IHNldE1vZGUgPSBOb3JtYWxTZXQpCiAgICAgeworICAgICAgICBDb2RlT3JpZ2luIG9sZFNlbWFu dGljT3JpZ2luID0gbV9jdXJyZW50U2VtYW50aWNPcmlnaW47CisgICAgICAgIG1fY3VycmVudFNl bWFudGljT3JpZ2luID0gc2VtYW50aWNPcmlnaW47CisKICAgICAgICAgdW5zaWduZWQgYXJndW1l bnQgPSBvcGVyYW5kLnRvQXJndW1lbnQoKTsKICAgICAgICAgQVNTRVJUKGFyZ3VtZW50IDwgbV9u dW1Bcmd1bWVudHMpOwogICAgICAgICAKQEAgLTQ0OCwxMSArNDU2LDEzIEBAIHByaXZhdGU6CiAg ICAgICAgICAgICB2YXJpYWJsZUFjY2Vzc0RhdGEtPm1lcmdlU2hvdWxkTmV2ZXJVbmJveCh0cnVl KTsKICAgICAgICAgCiAgICAgICAgIHZhcmlhYmxlQWNjZXNzRGF0YS0+bWVyZ2VTdHJ1Y3R1cmVD aGVja0hvaXN0aW5nRmFpbGVkKAotICAgICAgICAgICAgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0 UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkQ2FjaGUpKTsKKyAgICAgICAg ICAgIG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUoc2VtYW50aWNP cmlnaW4uYnl0ZWNvZGVJbmRleCwgQmFkQ2FjaGUpKTsKICAgICAgICAgdmFyaWFibGVBY2Nlc3NE YXRhLT5tZXJnZUNoZWNrQXJyYXlIb2lzdGluZ0ZhaWxlZCgKLSAgICAgICAgICAgIG1faW5saW5l U3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZElu ZGV4aW5nVHlwZSkpOworICAgICAgICAgICAgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmls ZS5oYXNFeGl0U2l0ZShzZW1hbnRpY09yaWdpbi5ieXRlY29kZUluZGV4LCBCYWRJbmRleGluZ1R5 cGUpKTsKICAgICAgICAgTm9kZSogbm9kZSA9IGFkZFRvR3JhcGgoU2V0TG9jYWwsIE9wSW5mbyh2 YXJpYWJsZUFjY2Vzc0RhdGEpLCB2YWx1ZSk7CiAgICAgICAgIG1fY3VycmVudEJsb2NrLT52YXJp YWJsZXNBdFRhaWwuYXJndW1lbnQoYXJndW1lbnQpID0gbm9kZTsKKworICAgICAgICBtX2N1cnJl bnRTZW1hbnRpY09yaWdpbiA9IG9sZFNlbWFudGljT3JpZ2luOwogICAgICAgICByZXR1cm4gbm9k ZTsKICAgICB9CiAgICAgCkBAIC01OTQsNiArNjA0LDEzIEBAIHByaXZhdGU6CiAgICAgewogICAg ICAgICByZXR1cm4gQ29kZU9yaWdpbihtX2N1cnJlbnRJbmRleCwgaW5saW5lQ2FsbEZyYW1lKCkp OwogICAgIH0KKworICAgIE5vZGVPcmlnaW4gY3VycmVudE5vZGVPcmlnaW4oKQorICAgIHsKKyAg ICAgICAgaWYgKG1fY3VycmVudFNlbWFudGljT3JpZ2luLmlzU2V0KCkpCisgICAgICAgICAgICBy ZXR1cm4gTm9kZU9yaWdpbihtX2N1cnJlbnRTZW1hbnRpY09yaWdpbiwgY3VycmVudENvZGVPcmln aW4oKSk7CisgICAgICAgIHJldHVybiBOb2RlT3JpZ2luKGN1cnJlbnRDb2RlT3JpZ2luKCkpOwor ICAgIH0KICAgICAKICAgICBCcmFuY2hEYXRhKiBicmFuY2hEYXRhKHVuc2lnbmVkIHRha2VuLCB1 bnNpZ25lZCBub3RUYWtlbikKICAgICB7CkBAIC02MDgsNyArNjI1LDcgQEAgcHJpdmF0ZToKICAg ICBOb2RlKiBhZGRUb0dyYXBoKE5vZGVUeXBlIG9wLCBOb2RlKiBjaGlsZDEgPSAwLCBOb2RlKiBj aGlsZDIgPSAwLCBOb2RlKiBjaGlsZDMgPSAwKQogICAgIHsKICAgICAgICAgTm9kZSogcmVzdWx0 ID0gbV9ncmFwaC5hZGROb2RlKAotICAgICAgICAgICAgU3BlY05vbmUsIG9wLCBOb2RlT3JpZ2lu KGN1cnJlbnRDb2RlT3JpZ2luKCkpLCBFZGdlKGNoaWxkMSksIEVkZ2UoY2hpbGQyKSwKKyAgICAg ICAgICAgIFNwZWNOb25lLCBvcCwgY3VycmVudE5vZGVPcmlnaW4oKSwgRWRnZShjaGlsZDEpLCBF ZGdlKGNoaWxkMiksCiAgICAgICAgICAgICBFZGdlKGNoaWxkMykpOwogICAgICAgICBBU1NFUlQo b3AgIT0gUGhpKTsKICAgICAgICAgbV9jdXJyZW50QmxvY2stPmFwcGVuZChyZXN1bHQpOwpAQCAt NjE3LDcgKzYzNCw3IEBAIHByaXZhdGU6CiAgICAgTm9kZSogYWRkVG9HcmFwaChOb2RlVHlwZSBv cCwgRWRnZSBjaGlsZDEsIEVkZ2UgY2hpbGQyID0gRWRnZSgpLCBFZGdlIGNoaWxkMyA9IEVkZ2Uo KSkKICAgICB7CiAgICAgICAgIE5vZGUqIHJlc3VsdCA9IG1fZ3JhcGguYWRkTm9kZSgKLSAgICAg ICAgICAgIFNwZWNOb25lLCBvcCwgTm9kZU9yaWdpbihjdXJyZW50Q29kZU9yaWdpbigpKSwgY2hp bGQxLCBjaGlsZDIsIGNoaWxkMyk7CisgICAgICAgICAgICBTcGVjTm9uZSwgb3AsIGN1cnJlbnRO b2RlT3JpZ2luKCksIGNoaWxkMSwgY2hpbGQyLCBjaGlsZDMpOwogICAgICAgICBBU1NFUlQob3Ag IT0gUGhpKTsKICAgICAgICAgbV9jdXJyZW50QmxvY2stPmFwcGVuZChyZXN1bHQpOwogICAgICAg ICByZXR1cm4gcmVzdWx0OwpAQCAtNjI1LDcgKzY0Miw3IEBAIHByaXZhdGU6CiAgICAgTm9kZSog YWRkVG9HcmFwaChOb2RlVHlwZSBvcCwgT3BJbmZvIGluZm8sIE5vZGUqIGNoaWxkMSA9IDAsIE5v ZGUqIGNoaWxkMiA9IDAsIE5vZGUqIGNoaWxkMyA9IDApCiAgICAgewogICAgICAgICBOb2RlKiBy ZXN1bHQgPSBtX2dyYXBoLmFkZE5vZGUoCi0gICAgICAgICAgICBTcGVjTm9uZSwgb3AsIE5vZGVP cmlnaW4oY3VycmVudENvZGVPcmlnaW4oKSksIGluZm8sIEVkZ2UoY2hpbGQxKSwgRWRnZShjaGls ZDIpLAorICAgICAgICAgICAgU3BlY05vbmUsIG9wLCBjdXJyZW50Tm9kZU9yaWdpbigpLCBpbmZv LCBFZGdlKGNoaWxkMSksIEVkZ2UoY2hpbGQyKSwKICAgICAgICAgICAgIEVkZ2UoY2hpbGQzKSk7 CiAgICAgICAgIEFTU0VSVChvcCAhPSBQaGkpOwogICAgICAgICBtX2N1cnJlbnRCbG9jay0+YXBw ZW5kKHJlc3VsdCk7CkBAIC02MzQsNyArNjUxLDcgQEAgcHJpdmF0ZToKICAgICBOb2RlKiBhZGRU b0dyYXBoKE5vZGVUeXBlIG9wLCBPcEluZm8gaW5mbzEsIE9wSW5mbyBpbmZvMiwgTm9kZSogY2hp bGQxID0gMCwgTm9kZSogY2hpbGQyID0gMCwgTm9kZSogY2hpbGQzID0gMCkKICAgICB7CiAgICAg ICAgIE5vZGUqIHJlc3VsdCA9IG1fZ3JhcGguYWRkTm9kZSgKLSAgICAgICAgICAgIFNwZWNOb25l LCBvcCwgTm9kZU9yaWdpbihjdXJyZW50Q29kZU9yaWdpbigpKSwgaW5mbzEsIGluZm8yLAorICAg ICAgICAgICAgU3BlY05vbmUsIG9wLCBjdXJyZW50Tm9kZU9yaWdpbigpLCBpbmZvMSwgaW5mbzIs CiAgICAgICAgICAgICBFZGdlKGNoaWxkMSksIEVkZ2UoY2hpbGQyKSwgRWRnZShjaGlsZDMpKTsK ICAgICAgICAgQVNTRVJUKG9wICE9IFBoaSk7CiAgICAgICAgIG1fY3VycmVudEJsb2NrLT5hcHBl bmQocmVzdWx0KTsKQEAgLTY0NCw3ICs2NjEsNyBAQCBwcml2YXRlOgogICAgIE5vZGUqIGFkZFRv R3JhcGgoTm9kZTo6VmFyQXJnVGFnLCBOb2RlVHlwZSBvcCwgT3BJbmZvIGluZm8xLCBPcEluZm8g aW5mbzIpCiAgICAgewogICAgICAgICBOb2RlKiByZXN1bHQgPSBtX2dyYXBoLmFkZE5vZGUoCi0g ICAgICAgICAgICBTcGVjTm9uZSwgTm9kZTo6VmFyQXJnLCBvcCwgTm9kZU9yaWdpbihjdXJyZW50 Q29kZU9yaWdpbigpKSwgaW5mbzEsIGluZm8yLAorICAgICAgICAgICAgU3BlY05vbmUsIE5vZGU6 OlZhckFyZywgb3AsIGN1cnJlbnROb2RlT3JpZ2luKCksIGluZm8xLCBpbmZvMiwKICAgICAgICAg ICAgIG1fZ3JhcGgubV92YXJBcmdDaGlsZHJlbi5zaXplKCkgLSBtX251bVBhc3NlZFZhckFyZ3Ms IG1fbnVtUGFzc2VkVmFyQXJncyk7CiAgICAgICAgIEFTU0VSVChvcCAhPSBQaGkpOwogICAgICAg ICBtX2N1cnJlbnRCbG9jay0+YXBwZW5kKHJlc3VsdCk7CkBAIC04NDMsNiArODYwLDggQEAgcHJp dmF0ZToKICAgICBCYXNpY0Jsb2NrKiBtX2N1cnJlbnRCbG9jazsKICAgICAvLyBUaGUgYnl0ZWNv ZGUgaW5kZXggb2YgdGhlIGN1cnJlbnQgaW5zdHJ1Y3Rpb24gYmVpbmcgZ2VuZXJhdGVkLgogICAg IHVuc2lnbmVkIG1fY3VycmVudEluZGV4OworICAgIC8vIFRoZSBzZW1hbnRpYyBvcmlnaW4gb2Yg dGhlIGN1cnJlbnQgbm9kZSBpZiBkaWZmZXJlbnQgZnJvbSB0aGUgY3VycmVudCBJbmRleC4KKyAg ICBDb2RlT3JpZ2luIG1fY3VycmVudFNlbWFudGljT3JpZ2luOwogCiAgICAgRnJvemVuVmFsdWUq IG1fY29uc3RhbnRVbmRlZmluZWQ7CiAgICAgRnJvemVuVmFsdWUqIG1fY29uc3RhbnROdWxsOwpA QCAtOTYxLDEyICs5ODAsMTQgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVTdGFja0VudHJ5KiBtX2lu bGluZVN0YWNrVG9wOwogICAgIAogICAgIHN0cnVjdCBEZWxheWVkU2V0TG9jYWwgeworICAgICAg ICBDb2RlT3JpZ2luIG1fb3JpZ2luOwogICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIgbV9vcGVyYW5k OwogICAgICAgICBOb2RlKiBtX3ZhbHVlOwogICAgICAgICAKICAgICAgICAgRGVsYXllZFNldExv Y2FsKCkgeyB9Ci0gICAgICAgIERlbGF5ZWRTZXRMb2NhbChWaXJ0dWFsUmVnaXN0ZXIgb3BlcmFu ZCwgTm9kZSogdmFsdWUpCi0gICAgICAgICAgICA6IG1fb3BlcmFuZChvcGVyYW5kKQorICAgICAg ICBEZWxheWVkU2V0TG9jYWwoY29uc3QgQ29kZU9yaWdpbiYgb3JpZ2luLCBWaXJ0dWFsUmVnaXN0 ZXIgb3BlcmFuZCwgTm9kZSogdmFsdWUpCisgICAgICAgICAgICA6IG1fb3JpZ2luKG9yaWdpbikK KyAgICAgICAgICAgICwgbV9vcGVyYW5kKG9wZXJhbmQpCiAgICAgICAgICAgICAsIG1fdmFsdWUo dmFsdWUpCiAgICAgICAgIHsKICAgICAgICAgfQpAQCAtOTc0LDggKzk5NSw4IEBAIHByaXZhdGU6 CiAgICAgICAgIE5vZGUqIGV4ZWN1dGUoQnl0ZUNvZGVQYXJzZXIqIHBhcnNlciwgU2V0TW9kZSBz ZXRNb2RlID0gTm9ybWFsU2V0KQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAobV9vcGVyYW5k LmlzQXJndW1lbnQoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gcGFyc2VyLT5zZXRBcmd1bWVu dChtX29wZXJhbmQsIG1fdmFsdWUsIHNldE1vZGUpOwotICAgICAgICAgICAgcmV0dXJuIHBhcnNl ci0+c2V0TG9jYWwobV9vcGVyYW5kLCBtX3ZhbHVlLCBzZXRNb2RlKTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gcGFyc2VyLT5zZXRBcmd1bWVudChtX29yaWdpbiwgbV9vcGVyYW5kLCBtX3ZhbHVl LCBzZXRNb2RlKTsKKyAgICAgICAgICAgIHJldHVybiBwYXJzZXItPnNldExvY2FsKG1fb3JpZ2lu LCBtX29wZXJhbmQsIG1fdmFsdWUsIHNldE1vZGUpOwogICAgICAgICB9CiAgICAgfTsKICAgICAK