148743 2015-09-03 11:21:08 -0700 StructureStubInfo should be able to reset itself without going through CodeBlock 2015-09-03 17:02:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other All All RESOLVED FIXED P2 Normal --- 148742 148718 1 fpizlo fpizlo barraclough basile_clement benjamin ggaren mark.lam mhahnenb msaboff nrotem oliver saam sam oldest_to_newest 1123097 0 fpizlo 2015-09-03 11:21:08 -0700 When StructureStubInfo concludes that things are dead, or a watchpoint fires, we shouldn't have to call into CodeBlock to clear the stub. The stub should be able to clear itself. 1123190 1 260531 fpizlo 2015-09-03 15:32:08 -0700 Created attachment 260531 the patch 1123199 2 260531 ggaren 2015-09-03 16:02:08 -0700 Comment on attachment 260531 the patch r=me 1123222 3 fpizlo 2015-09-03 17:02:56 -0700 Landed in http://trac.webkit.org/changeset/189323 260531 2015-09-03 15:32:08 -0700 2015-09-03 16:02:08 -0700 the patch blah.patch text/plain 11220 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg5MjkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDE1LTA5LTAzICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg U3RydWN0dXJlU3R1YkluZm8gc2hvdWxkIGJlIGFibGUgdG8gcmVzZXQgaXRzZWxmIHdpdGhvdXQg Z29pbmcgdGhyb3VnaCBDb2RlQmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0ODc0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlIGhhZCBzb21lIHJlc2V0U3R1Yi4uLigpIG1ldGhvZHMgaW4gQ29k ZUJsb2NrIHRoYXQgZGlkbid0IHJlYWxseSBkbyBhbnl0aGluZyB0aGF0CisgICAgICAgIFN0cnVj dHVyZVN0dWJJbmZvIGNvdWxkbid0IGRvIGJ5IGl0c2VsZi4gSXQgbWFrZXMgc2Vuc2UgZm9yIHRo ZSBmdW5jdGlvbmFsaXR5IHRvIHJlc2V0IGEKKyAgICAgICAgc3R1YiB0byBiZSBpbiB0aGUgc3R1 YiBjbGFzcywgbm90IGluIENvZGVCbG9jay4KKworICAgICAgICBJdCdzIHN0aWxsIHRydWUgdGhh dDoKKworICAgICAgICAtIEluIG9yZGVyIHRvIG1lc3Mgd2l0aCBhIFN0cnVjdHVyZVN0dWJJbmZv LCB5b3UgZWl0aGVyIGhhdmUgdG8gYmUgaW4gR0Mgb3IgeW91IGhhdmUgdG8KKyAgICAgICAgICBi ZSBob2xkaW5nIHRoZSBvd25pbmcgQ29kZUJsb2NrJ3MgbG9jay4KKworICAgICAgICAtIFN0cnVj dHVyZVN0dWJJbmZvIGRvZXNuJ3QgcmVtZW1iZXIgd2hpY2ggQ29kZUJsb2NrIG93bnMgaXQgKHRv IHNhdmUgc3BhY2UpLCBhbmQgYWxsCisgICAgICAgICAgb2YgdGhlIGNhbGxlcnMgb2YgU3RydWN0 dXJlU3R1YkluZm8gbWV0aG9kcyBrbm93IHdoaWNoIENvZGVCbG9jayBvd24gaXQuIFNvLCBtYW55 IHN0dWIKKyAgICAgICAgICBtZXRob2RzIHRha2UgQ29kZUJsb2NrKiBhcyBhbiBhcmd1bWVudC4K KworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVC bG9jazo6ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6 OmFkZENhbGxMaW5rSW5mbyk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6Z2V0Q2FsbExpbmtJ bmZvRm9yQnl0ZWNvZGVJbmRleCk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6cmVzZXRTdHVi KTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpyZXNldFN0dWJJbnRlcm5hbCk6 IERlbGV0ZWQuCisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6cmVzZXRTdHViRHVyaW5nR0NJbnRl cm5hbCk6IERlbGV0ZWQuCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmg6CisgICAgICAg ICogYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkNsZWFyaW5nV2F0Y2hwb2ludC5jcHA6CisgICAgICAg IChKU0M6OlN0cnVjdHVyZVN0dWJDbGVhcmluZ1dhdGNocG9pbnQ6OmZpcmVJbnRlcm5hbCk6Cisg ICAgICAgICogYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uY3BwOgorICAgICAgICAoSlNDOjpT dHJ1Y3R1cmVTdHViSW5mbzo6ZGVyZWYpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVTdHViSW5m bzo6cmVzZXQpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVTdHViSW5mbzo6dmlzaXRXZWFrUmVm ZXJlbmNlcyk6CisgICAgICAgICogYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uaDoKKyAgICAg ICAgKEpTQzo6U3RydWN0dXJlU3R1YkluZm86OmluaXRJbkxpc3QpOgorICAgICAgICAoSlNDOjpT dHJ1Y3R1cmVTdHViSW5mbzo6c2Vlbk9uY2UpOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVTdHVi SW5mbzo6cmVzZXQpOiBEZWxldGVkLgorCiAyMDE1LTA5LTAzICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBSZXBhdGNoQnVmZmVyIGFuZCByZXBs YWNlIGl0IHdpdGggc3RhdGljIGZ1bmN0aW9ucwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE4OTI4OCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NjkwLDExICsyNjkwLDcgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmFsaXplVW5jb25kaXRpb25hbGx5 KAogCiAgICAgICAgIGZvciAoQmFnPFN0cnVjdHVyZVN0dWJJbmZvPjo6aXRlcmF0b3IgaXRlciA9 IG1fc3R1YkluZm9zLmJlZ2luKCk7ICEhaXRlcjsgKytpdGVyKSB7CiAgICAgICAgICAgICBTdHJ1 Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8gPSAqKml0ZXI7Ci0gICAgICAgICAgICAKLSAgICAgICAg ICAgIGlmIChzdHViSW5mby52aXNpdFdlYWtSZWZlcmVuY2VzKCp2bSgpKSkKLSAgICAgICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgcmVzZXRTdHViRHVyaW5n R0NJbnRlcm5hbChzdHViSW5mbyk7CisgICAgICAgICAgICBzdHViSW5mby52aXNpdFdlYWtSZWZl cmVuY2VzKHRoaXMpOwogICAgICAgICB9CiAgICAgfQogI2VuZGlmCkBAIC0yNzc0LDQ2ICsyNzcw LDYgQEAgQ2FsbExpbmtJbmZvKiBDb2RlQmxvY2s6OmFkZENhbGxMaW5rSW5mbwogICAgIHJldHVy biBtX2NhbGxMaW5rSW5mb3MuYWRkKCk7CiB9CiAKLXZvaWQgQ29kZUJsb2NrOjpyZXNldFN0dWIo U3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZvKQotewotICAgIGlmIChzdHViSW5mby5hY2Nlc3NU eXBlID09IGFjY2Vzc191bnNldCkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIENvbmN1cnJl bnRKSVRMb2NrZXIgbG9ja2VyKG1fbG9jayk7Ci0gICAgCi0gICAgcmVzZXRTdHViSW50ZXJuYWwo c3R1YkluZm8pOwotfQotCi12b2lkIENvZGVCbG9jazo6cmVzZXRTdHViSW50ZXJuYWwoU3RydWN0 dXJlU3R1YkluZm8mIHN0dWJJbmZvKQotewotICAgIEFjY2Vzc1R5cGUgYWNjZXNzVHlwZSA9IHN0 YXRpY19jYXN0PEFjY2Vzc1R5cGU+KHN0dWJJbmZvLmFjY2Vzc1R5cGUpOwotICAgIAotICAgIGlm IChPcHRpb25zOjp2ZXJib3NlT1NSKCkpIHsKLSAgICAgICAgLy8gVGhpcyBjYW4gYmUgY2FsbGVk IGZyb20gR0MgZGVzdHJ1Y3RvciBjYWxscywgc28gd2UgZG9uJ3QgdHJ5IHRvIGRvIGEgZnVsbCBk dW1wCi0gICAgICAgIC8vIG9mIHRoZSBDb2RlQmxvY2suCi0gICAgICAgIGRhdGFMb2coIkNsZWFy aW5nIHN0cnVjdHVyZSBjYWNoZSAoa2luZCAiLCBzdGF0aWNfY2FzdDxpbnQ+KHN0dWJJbmZvLmFj Y2Vzc1R5cGUpLCAiKSBpbiAiLCBSYXdQb2ludGVyKHRoaXMpLCAiLlxuIik7Ci0gICAgfQotICAg IAotICAgIFJFTEVBU0VfQVNTRVJUKEpJVENvZGU6OmlzSklUKGppdFR5cGUoKSkpOwotICAgIAot ICAgIGlmIChpc0dldEJ5SWRBY2Nlc3MoYWNjZXNzVHlwZSkpCi0gICAgICAgIHJlc2V0R2V0QnlJ RCh0aGlzLCBzdHViSW5mbyk7Ci0gICAgZWxzZSBpZiAoaXNQdXRCeUlkQWNjZXNzKGFjY2Vzc1R5 cGUpKQotICAgICAgICByZXNldFB1dEJ5SUQodGhpcywgc3R1YkluZm8pOwotICAgIGVsc2Ugewot ICAgICAgICBSRUxFQVNFX0FTU0VSVChpc0luQWNjZXNzKGFjY2Vzc1R5cGUpKTsKLSAgICAgICAg cmVzZXRJbih0aGlzLCBzdHViSW5mbyk7Ci0gICAgfQotICAgIAotICAgIHN0dWJJbmZvLnJlc2V0 KCk7Ci19Ci0KLXZvaWQgQ29kZUJsb2NrOjpyZXNldFN0dWJEdXJpbmdHQ0ludGVybmFsKFN0cnVj dHVyZVN0dWJJbmZvJiBzdHViSW5mbykKLXsKLSAgICByZXNldFN0dWJJbnRlcm5hbChzdHViSW5m byk7Ci0gICAgc3R1YkluZm8ucmVzZXRCeUdDID0gdHJ1ZTsKLX0KLQogQ2FsbExpbmtJbmZvKiBD b2RlQmxvY2s6OmdldENhbGxMaW5rSW5mb0ZvckJ5dGVjb2RlSW5kZXgodW5zaWduZWQgaW5kZXgp CiB7CiAgICAgZm9yIChhdXRvIGl0ZXIgPSBtX2NhbGxMaW5rSW5mb3MuYmVnaW4oKTsgISFpdGVy OyArK2l0ZXIpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJs b2NrLmgJKHJldmlzaW9uIDE4OTI4OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9Db2RlQmxvY2suaAkod29ya2luZyBjb3B5KQpAQCAtMjE1LDggKzIxNSw2IEBAIHB1YmxpYzoK ICAgICAvLyBzdHViIGluZm8uCiAgICAgU3RydWN0dXJlU3R1YkluZm8qIGZpbmRTdHViSW5mbyhD b2RlT3JpZ2luKTsKIAotICAgIHZvaWQgcmVzZXRTdHViKFN0cnVjdHVyZVN0dWJJbmZvJik7Ci0K ICAgICBCeVZhbEluZm8qIGFkZEJ5VmFsSW5mbygpOwogCiAgICAgQ2FsbExpbmtJbmZvKiBhZGRD YWxsTGlua0luZm8oKTsKQEAgLTk4MCwxMCArOTc4LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQg aW5zZXJ0QmFzaWNCbG9ja0JvdW5kYXJpZXNGb3JDb250cm9sRmxvd1Byb2ZpbGVyKFZlY3RvcjxJ bnN0cnVjdGlvbiwgMCwgVW5zYWZlVmVjdG9yT3ZlcmZsb3c+Jik7CiAKLSNpZiBFTkFCTEUoSklU KQotICAgIHZvaWQgcmVzZXRTdHViSW50ZXJuYWwoU3RydWN0dXJlU3R1YkluZm8mKTsKLSAgICB2 b2lkIHJlc2V0U3R1YkR1cmluZ0dDSW50ZXJuYWwoU3RydWN0dXJlU3R1YkluZm8mKTsKLSNlbmRp ZgogICAgIFdyaXRlQmFycmllcjxVbmxpbmtlZENvZGVCbG9jaz4gbV91bmxpbmtlZENvZGU7CiAg ICAgaW50IG1fbnVtUGFyYW1ldGVyczsKICAgICB1bmlvbiB7CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkNsZWFyaW5nV2F0Y2hwb2ludC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJD bGVhcmluZ1dhdGNocG9pbnQuY3BwCShyZXZpc2lvbiAxODkyODYpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkNsZWFyaW5nV2F0Y2hwb2ludC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDggQEAgdm9pZCBTdHJ1Y3R1cmVTdHViQ2xlYXJpbmdX YXRjaHBvaW50OjpmaQogICAgICAgICAvLyBUaGlzIHdpbGwgaW1wbGljaXRseSBjYXVzZSBteSBv d24gZGVtaXNlOiBzdHViIHJlc2V0IHJlbW92ZXMgYWxsIHdhdGNocG9pbnRzLgogICAgICAgICAv LyBUaGF0IHdvcmtzLCBiZWNhdXNlIGRlbGV0aW5nIGEgd2F0Y2hwb2ludCByZW1vdmVzIGl0IGZy b20gdGhlIHNldCdzIGxpc3QsIGFuZAogICAgICAgICAvLyB0aGUgc2V0J3MgbGlzdCB0cmF2ZXJz YWwgZm9yIGZpcmluZyBpcyByb2J1c3QgYWdhaW5zdCB0aGUgc2V0IGNoYW5naW5nLgotICAgICAg ICBtX2hvbGRlci5jb2RlQmxvY2soKS0+cmVzZXRTdHViKCptX2hvbGRlci5zdHViSW5mbygpKTsK KyAgICAgICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIobV9ob2xkZXIuY29kZUJsb2NrKCkt Pm1fbG9jayk7CisgICAgICAgIG1faG9sZGVyLnN0dWJJbmZvKCktPnJlc2V0KG1faG9sZGVyLmNv ZGVCbG9jaygpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uY3BwCShyZXZp c2lvbiAxODkyODgpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJl U3R1YkluZm8uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAi SlNPYmplY3QuaCIKICNpbmNsdWRlICJQb2x5bW9ycGhpY0dldEJ5SWRMaXN0LmgiCiAjaW5jbHVk ZSAiUG9seW1vcnBoaWNQdXRCeUlkTGlzdC5oIgorI2luY2x1ZGUgIlJlcGF0Y2guaCIKIAogbmFt ZXNwYWNlIEpTQyB7CiAKQEAgLTYzLDQ2ICs2NCw3NSBAQCB2b2lkIFN0cnVjdHVyZVN0dWJJbmZv OjpkZXJlZigpCiAgICAgfQogfQogCi1ib29sIFN0cnVjdHVyZVN0dWJJbmZvOjp2aXNpdFdlYWtS ZWZlcmVuY2VzKFZNJiB2bSkKK3ZvaWQgU3RydWN0dXJlU3R1YkluZm86OnJlc2V0KENvZGVCbG9j ayogY29kZUJsb2NrKQogeworICAgIGlmIChhY2Nlc3NUeXBlID09IGFjY2Vzc191bnNldCkKKyAg ICAgICAgcmV0dXJuOworICAgIAorICAgIGlmIChPcHRpb25zOjp2ZXJib3NlT1NSKCkpIHsKKyAg ICAgICAgLy8gVGhpcyBjYW4gYmUgY2FsbGVkIGZyb20gR0MgZGVzdHJ1Y3RvciBjYWxscywgc28g d2UgZG9uJ3QgdHJ5IHRvIGRvIGEgZnVsbCBkdW1wCisgICAgICAgIC8vIG9mIHRoZSBDb2RlQmxv Y2suCisgICAgICAgIGRhdGFMb2coIkNsZWFyaW5nIHN0cnVjdHVyZSBjYWNoZSAoa2luZCAiLCBz dGF0aWNfY2FzdDxpbnQ+KGFjY2Vzc1R5cGUpLCAiKSBpbiAiLCBSYXdQb2ludGVyKGNvZGVCbG9j ayksICIuXG4iKTsKKyAgICB9CisgICAgCisgICAgaWYgKGlzR2V0QnlJZEFjY2VzcyhzdGF0aWNf Y2FzdDxBY2Nlc3NUeXBlPihhY2Nlc3NUeXBlKSkpCisgICAgICAgIHJlc2V0R2V0QnlJRChjb2Rl QmxvY2ssICp0aGlzKTsKKyAgICBlbHNlIGlmIChpc1B1dEJ5SWRBY2Nlc3Moc3RhdGljX2Nhc3Q8 QWNjZXNzVHlwZT4oYWNjZXNzVHlwZSkpKQorICAgICAgICByZXNldFB1dEJ5SUQoY29kZUJsb2Nr LCAqdGhpcyk7CisgICAgZWxzZSB7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKGlzSW5BY2Nlc3Mo c3RhdGljX2Nhc3Q8QWNjZXNzVHlwZT4oYWNjZXNzVHlwZSkpKTsKKyAgICAgICAgcmVzZXRJbihj b2RlQmxvY2ssICp0aGlzKTsKKyAgICB9CisgICAgCisgICAgZGVyZWYoKTsKKyAgICBhY2Nlc3NU eXBlID0gYWNjZXNzX3Vuc2V0OworICAgIHN0dWJSb3V0aW5lID0gbnVsbHB0cjsKKyAgICB3YXRj aHBvaW50cyA9IG51bGxwdHI7Cit9CisKK3ZvaWQgU3RydWN0dXJlU3R1YkluZm86OnZpc2l0V2Vh a1JlZmVyZW5jZXMoQ29kZUJsb2NrKiBjb2RlQmxvY2spCit7CisgICAgVk0mIHZtID0gKmNvZGVC bG9jay0+dm0oKTsKKyAgICAKICAgICBzd2l0Y2ggKGFjY2Vzc1R5cGUpIHsKICAgICBjYXNlIGFj Y2Vzc19nZXRfYnlfaWRfc2VsZjoKLSAgICAgICAgaWYgKCFIZWFwOjppc01hcmtlZCh1LmdldEJ5 SWRTZWxmLmJhc2VPYmplY3RTdHJ1Y3R1cmUuZ2V0KCkpKQotICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgICAgICBpZiAoSGVhcDo6aXNNYXJrZWQodS5nZXRCeUlkU2VsZi5iYXNlT2JqZWN0 U3RydWN0dXJlLmdldCgpKSkKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBhY2Nlc3NfZ2V0X2J5X2lkX2xpc3Q6IHsKLSAgICAgICAgaWYgKCF1LmdldEJ5SWRM aXN0Lmxpc3QtPnZpc2l0V2Vhayh2bSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIGlmICh1LmdldEJ5SWRMaXN0Lmxpc3QtPnZpc2l0V2Vhayh2bSkpCisgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIGFjY2Vzc19wdXRfYnlfaWRf dHJhbnNpdGlvbl9ub3JtYWw6CiAgICAgY2FzZSBhY2Nlc3NfcHV0X2J5X2lkX3RyYW5zaXRpb25f ZGlyZWN0OgotICAgICAgICBpZiAoIUhlYXA6OmlzTWFya2VkKHUucHV0QnlJZFRyYW5zaXRpb24u cHJldmlvdXNTdHJ1Y3R1cmUuZ2V0KCkpCi0gICAgICAgICAgICB8fCAhSGVhcDo6aXNNYXJrZWQo dS5wdXRCeUlkVHJhbnNpdGlvbi5zdHJ1Y3R1cmUuZ2V0KCkpKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgICAgICBpZiAoIU9iamVjdFByb3BlcnR5Q29uZGl0aW9uU2V0Ojpmcm9tUmF3 UG9pbnRlcih1LnB1dEJ5SWRUcmFuc2l0aW9uLnJhd0NvbmRpdGlvblNldCkuYXJlU3RpbGxMaXZl KCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChIZWFwOjppc01hcmtl ZCh1LnB1dEJ5SWRUcmFuc2l0aW9uLnByZXZpb3VzU3RydWN0dXJlLmdldCgpKQorICAgICAgICAg ICAgJiYgSGVhcDo6aXNNYXJrZWQodS5wdXRCeUlkVHJhbnNpdGlvbi5zdHJ1Y3R1cmUuZ2V0KCkp CisgICAgICAgICAgICAmJiBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvblNldDo6ZnJvbVJhd1BvaW50 ZXIodS5wdXRCeUlkVHJhbnNpdGlvbi5yYXdDb25kaXRpb25TZXQpLmFyZVN0aWxsTGl2ZSgpKQor ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBicmVhazsKICAgICBjYXNlIGFjY2Vzc19wdXRf YnlfaWRfcmVwbGFjZToKLSAgICAgICAgaWYgKCFIZWFwOjppc01hcmtlZCh1LnB1dEJ5SWRSZXBs YWNlLmJhc2VPYmplY3RTdHJ1Y3R1cmUuZ2V0KCkpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICBpZiAoSGVhcDo6aXNNYXJrZWQodS5wdXRCeUlkUmVwbGFjZS5iYXNlT2JqZWN0 U3RydWN0dXJlLmdldCgpKSkKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBhY2Nlc3NfcHV0X2J5X2lkX2xpc3Q6Ci0gICAgICAgIGlmICghdS5wdXRCeUlkTGlz dC5saXN0LT52aXNpdFdlYWsodm0pKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICBpZiAodS5wdXRCeUlkTGlzdC5saXN0LT52aXNpdFdlYWsodm0pKQorICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICBicmVhazsKICAgICBjYXNlIGFjY2Vzc19pbl9saXN0OiB7CiAgICAgICAg IFBvbHltb3JwaGljQWNjZXNzU3RydWN0dXJlTGlzdCogcG9seW1vcnBoaWNTdHJ1Y3R1cmVzID0g dS5pbkxpc3Quc3RydWN0dXJlTGlzdDsKLSAgICAgICAgaWYgKCFwb2x5bW9ycGhpY1N0cnVjdHVy ZXMtPnZpc2l0V2Vhayh1LmluTGlzdC5saXN0U2l6ZSkpCi0gICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIGlmIChwb2x5bW9ycGhpY1N0cnVjdHVyZXMtPnZpc2l0V2Vhayh1LmluTGlz dC5saXN0U2l6ZSkpCisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGJyZWFrOwogICAgIH0K ICAgICBkZWZhdWx0OgogICAgICAgICAvLyBUaGUgcmVzdCBvZiB0aGUgaW5zdHJ1Y3Rpb25zIGRv bid0IHJlcXVpcmUgcmVmZXJlbmNlcywgc28gdGhlcmUgaXMgbm8gbmVlZCB0bwogICAgICAgICAv LyBkbyBhbnl0aGluZy4KLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybjsKICAgICB9Ci0g ICAgcmV0dXJuIHRydWU7CisKKyAgICByZXNldChjb2RlQmxvY2spOworICAgIHJlc2V0QnlHQyA9 IHRydWU7CiB9CiAjZW5kaWYKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L1N0cnVjdHVyZVN0dWJJbmZvLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmgJKHJldmlzaW9uIDE4OTI4OCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5mby5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNDcsMjUgKzE0NywxMyBAQCBzdHJ1Y3QgU3RydWN0dXJlU3R1YkluZm8gewogICAg ICAgICB1LmluTGlzdC5saXN0U2l6ZSA9IGxpc3RTaXplOwogICAgIH0KICAgICAgICAgCi0gICAg dm9pZCByZXNldCgpCi0gICAgewotICAgICAgICBkZXJlZigpOwotICAgICAgICBhY2Nlc3NUeXBl ID0gYWNjZXNzX3Vuc2V0OwotICAgICAgICBzdHViUm91dGluZSA9IG51bGxwdHI7Ci0gICAgICAg IHdhdGNocG9pbnRzID0gbnVsbHB0cjsKLSAgICB9CisgICAgdm9pZCByZXNldChDb2RlQmxvY2sq KTsKIAogICAgIHZvaWQgZGVyZWYoKTsKIAotICAgIC8vIENoZWNrIGlmIHRoZSBzdHViIGhhcyB3 ZWFrIHJlZmVyZW5jZXMgdGhhdCBhcmUgZGVhZC4gSWYgdGhlcmUgYXJlIGRlYWQgb25lcyB0aGF0 IGltcGx5Ci0gICAgLy8gdGhhdCB0aGUgc3R1YiBzaG91bGQgYmUgZW50aXJlbHkgcmVzZXQsIHRo aXMgc2hvdWxkIHJldHVybiBmYWxzZS4gSWYgdGhlcmUgYXJlIGRlYWQgb25lcwotICAgIC8vIHRo YXQgY2FuIGJlIGhhbmRsZWQgaW50ZXJuYWxseSBieSB0aGUgc3R1YiBhbmQgZG9uJ3QgcmVxdWly ZSBhIGZ1bGwgcmVzZXQsIHRoZW4gdGhpcwotICAgIC8vIHNob3VsZCByZXNldCB0aGVtIGFuZCBy ZXR1cm4gdHJ1ZS4gSWYgdGhlcmUgYXJlIG5vIGRlYWQgd2VhayByZWZlcmVuY2VzLCByZXR1cm4g dHJ1ZS4KLSAgICAvLyBJZiB0aGlzIG1ldGhvZCByZXR1cm5zIHRydWUgaXQgbWVhbnMgdGhhdCBp dCBoYXMgbGVmdCB0aGUgc3R1YiBpbiBhIHN0YXRlIHdoZXJlIGFsbAotICAgIC8vIG91dGdvaW5n IEdDIHBvaW50ZXJzIGFyZSBrbm93biB0byBwb2ludCB0byBjdXJyZW50bHkgbWFya2VkIG9iamVj dHM7IHRoaXMgbWV0aG9kIGlzCi0gICAgLy8gYWxsb3dlZCB0byBhY2NvbXBsaXNoIHRoaXMgYnkg ZWl0aGVyIGNsZWFyaW5nIHRob3NlIHBvaW50ZXJzIHNvbWVob3cgb3IgYnkgcHJvdmluZyB0aGF0 Ci0gICAgLy8gdGhleSBoYXZlIGFscmVhZHkgYmVlbiBtYXJrZWQuIEl0IGlzIG5vdCBhbGxvd2Vk IHRvIG1hcmsgbmV3IG9iamVjdHMuCi0gICAgYm9vbCB2aXNpdFdlYWtSZWZlcmVuY2VzKFZNJik7 CisgICAgLy8gQ2hlY2sgaWYgdGhlIHN0dWIgaGFzIHdlYWsgcmVmZXJlbmNlcyB0aGF0IGFyZSBk ZWFkLiBJZiBpdCBkb2VzLCB0aGVuIGl0IHJlc2V0cyBpdHNlbGYsCisgICAgLy8gZWl0aGVyIGVu dGlyZWx5IG9yIGp1c3QgZW5vdWdoIHRvIGVuc3VyZSB0aGF0IHRob3NlIGRlYWQgcG9pbnRlcnMg ZG9uJ3QgZ2V0IHVzZWQgYW55bW9yZS4KKyAgICB2b2lkIHZpc2l0V2Vha1JlZmVyZW5jZXMoQ29k ZUJsb2NrKik7CiAgICAgICAgIAogICAgIGJvb2wgc2Vlbk9uY2UoKQogICAgIHsK