196359 2019-03-28 11:45:23 -0700 CodeBlock::jettison() should disallow repatching its own calls 2019-03-28 15:05:42 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tzagallo tzagallo commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1522146 0 tzagallo 2019-03-28 11:45:23 -0700 <rdar://problem/48973663> 1522157 1 366192 tzagallo 2019-03-28 12:05:07 -0700 Created attachment 366192 Patch 1522191 2 366192 saam 2019-03-28 13:29:35 -0700 Comment on attachment 366192 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366192&action=review > Source/JavaScriptCore/ChangeLog:12 > + OSR exit address while unlinking all the incoming CallLinkInfos latter in latter => later 1522194 3 366192 saam 2019-03-28 13:33:58 -0700 Comment on attachment 366192 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366192&action=review > Source/JavaScriptCore/ChangeLog:17 > + Change it so that we set a flag, `clearedByJettison`, in all the CallLinkInfos > + owned by the CodeBlock being jettisoned. If the flag is set, we will avoid > + repatching the call during unlinking. It took me a few minutes to agree that this is safe, but maybe it's worth expanding on in a sentence or two. The beginning of this call should never be reachable again after the CodeBlock is jettisoned. 1522195 4 366192 saam 2019-03-28 13:34:24 -0700 Comment on attachment 366192 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366192&action=review > JSTests/stress/call-link-info-osrexit-repatch.js:3 > +function foo(a, b) { style nit: use 4 space indent 1522212 5 366203 tzagallo 2019-03-28 14:25:57 -0700 Created attachment 366203 Patch for landing 1522238 6 366203 commit-queue 2019-03-28 15:05:40 -0700 Comment on attachment 366203 Patch for landing Clearing flags on attachment: 366203 Committed r243626: <https://trac.webkit.org/changeset/243626> 1522239 7 commit-queue 2019-03-28 15:05:42 -0700 All reviewed patches have been landed. Closing bug. 366192 2019-03-28 12:05:07 -0700 2019-03-28 14:25:53 -0700 Patch bug-196359-20190328200505.patch text/plain 8736 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 M2Y4YTllMTYzOTc5MTc4NzM5ODY4MmJhZWIzYzQzNjU0ZDI2Zjk0Li5kOGI0ZjViNTEwY2NkYWI1 NGI0ZjAxODVjN2NhZTRkY2VjMmJhZjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNSBAQAorMjAxOS0wMy0yOCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBDb2RlQmxvY2s6OmpldHRpc29uKCkgc2hvdWxkIGRpc2FsbG93IHJlcGF0 Y2hpbmcgaXRzIG93biBjYWxscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTk2MzU5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODk3MzY2Mz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb2RlQmxvY2s6 OmpldHRpc29uKCkgY2FsbHMgQ29tbW9uRGF0YTo6aW52YWxpZGF0ZSwgd2hpY2ggcmVwbGFjZXMg dGhlIGBobHRgCisgICAgICAgIGluc3RydWN0aW9uIHdpdGggdGhlIGp1bXAgdG8gT1NSIGV4aXQu IEhvd2V2ZXIsIGlmIHRoZSBgaGx0YCB3YXMgaW1tZWRpYXRlbHkKKyAgICAgICAgZm9sbG93ZWQg YnkgYSBjYWxsIHRvIHRoZSBDb2RlQmxvY2sgYmVpbmcgamV0dGlzb25lZCwgd2Ugd291bGQgd3Jp dGUgb3ZlciB0aGUKKyAgICAgICAgT1NSIGV4aXQgYWRkcmVzcyB3aGlsZSB1bmxpbmtpbmcgYWxs IHRoZSBpbmNvbWluZyBDYWxsTGlua0luZm9zIGxhdHRlciBpbgorICAgICAgICBDb2RlQmxvY2s6 OmpldHRpc29uKCkuCisKKyAgICAgICAgQ2hhbmdlIGl0IHNvIHRoYXQgd2Ugc2V0IGEgZmxhZywg YGNsZWFyZWRCeUpldHRpc29uYCwgaW4gYWxsIHRoZSBDYWxsTGlua0luZm9zCisgICAgICAgIG93 bmVkIGJ5IHRoZSBDb2RlQmxvY2sgYmVpbmcgamV0dGlzb25lZC4gSWYgdGhlIGZsYWcgaXMgc2V0 LCB3ZSB3aWxsIGF2b2lkCisgICAgICAgIHJlcGF0Y2hpbmcgdGhlIGNhbGwgZHVyaW5nIHVubGlu a2luZy4KKworICAgICAgICAqIGJ5dGVjb2RlL0NhbGxMaW5rSW5mby5jcHA6CisgICAgICAgIChK U0M6OkNhbGxMaW5rSW5mbzo6Q2FsbExpbmtJbmZvKToKKyAgICAgICAgKEpTQzo6Q2FsbExpbmtJ bmZvOjpzZXRDYWxsZWUpOgorICAgICAgICAoSlNDOjpDYWxsTGlua0luZm86OmNsZWFyQ2FsbGVl KToKKyAgICAgICAgKEpTQzo6Q2FsbExpbmtJbmZvOjpzZXRDb2RlQmxvY2spOgorICAgICAgICAo SlNDOjpDYWxsTGlua0luZm86OmNsZWFyQ29kZUJsb2NrKToKKyAgICAgICAgKiBieXRlY29kZS9D YWxsTGlua0luZm8uaDoKKyAgICAgICAgKEpTQzo6Q2FsbExpbmtJbmZvOjpjbGVhcmVkQnlKZXR0 aXNvbik6CisgICAgICAgIChKU0M6OkNhbGxMaW5rSW5mbzo6c2V0Q2xlYXJlZEJ5SmV0dGlzb24p OgorICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVC bG9jazo6amV0dGlzb24pOgorICAgICAgICAqIGppdC9SZXBhdGNoLmNwcDoKKyAgICAgICAgKEpT Qzo6cmV2ZXJ0Q2FsbCk6CisKIDIwMTktMDMtMjUgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxl ckBhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV9vcCA9PSBDb21wYXJl U3RyaWN0RXEgaW4gSlNDOjpERkc6Ok5vZGU6OmNvbnZlcnRUb0NvbXBhcmVFcVB0cihKU0M6OkRG Rzo6RnJvemVuVmFsdWUgKiwgSlNDOjpERkc6OkVkZ2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ2FsbExpbmtJbmZvLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9DYWxsTGlua0luZm8uY3BwCmluZGV4IGMwYTM3Nzg1NmIyNmU1ZGEwOWJj M2JjYWQxYmFjMGRhNTM5YWU4OTMuLmYzOGMwMzdkMTUwYThlOWYyODhmNzRhNDZjMTRhMzA1YWNh ZDFmZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9DYWxsTGlu a0luZm8uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9DYWxsTGlua0lu Zm8uY3BwCkBAIC02MSw3ICs2MSw3IEBAIENhbGxMaW5rSW5mbzo6Q2FsbExpbmtJbmZvKCkKICAg ICAsIG1fY2xlYXJlZEJ5R0MoZmFsc2UpCiAgICAgLCBtX2NsZWFyZWRCeVZpcnR1YWwoZmFsc2Up CiAgICAgLCBtX2FsbG93U3R1YnModHJ1ZSkKLSAgICAsIG1faXNMaW5rZWQoZmFsc2UpCisgICAg LCBtX2NsZWFyZWRCeUpldHRpc29uKGZhbHNlKQogICAgICwgbV9jYWxsVHlwZShOb25lKQogICAg ICwgbV9jYWxsZWVHUFIoMjU1KQogICAgICwgbV9tYXhOdW1Bcmd1bWVudHMoMCkKQEAgLTEyNyw3 ICsxMjcsNiBAQCB2b2lkIENhbGxMaW5rSW5mbzo6c2V0Q2FsbGVlKFZNJiB2bSwgSlNDZWxsKiBv d25lciwgSlNPYmplY3QqIGNhbGxlZSkKICAgICBSRUxFQVNFX0FTU0VSVCghaXNEaXJlY3QoKSk7 CiAgICAgTWFjcm9Bc3NlbWJsZXI6OnJlcGF0Y2hQb2ludGVyKGhvdFBhdGhCZWdpbigpLCBjYWxs ZWUpOwogICAgIG1fY2FsbGVlT3JDb2RlQmxvY2suc2V0KHZtLCBvd25lciwgY2FsbGVlKTsKLSAg ICBtX2lzTGlua2VkID0gdHJ1ZTsKIH0KIAogdm9pZCBDYWxsTGlua0luZm86OmNsZWFyQ2FsbGVl KCkKQEAgLTEzNSw3ICsxMzQsNiBAQCB2b2lkIENhbGxMaW5rSW5mbzo6Y2xlYXJDYWxsZWUoKQog ICAgIFJFTEVBU0VfQVNTRVJUKCFpc0RpcmVjdCgpKTsKICAgICBNYWNyb0Fzc2VtYmxlcjo6cmVw YXRjaFBvaW50ZXIoaG90UGF0aEJlZ2luKCksIG51bGxwdHIpOwogICAgIG1fY2FsbGVlT3JDb2Rl QmxvY2suY2xlYXIoKTsKLSAgICBtX2lzTGlua2VkID0gZmFsc2U7CiB9CiAKIEpTT2JqZWN0KiBD YWxsTGlua0luZm86OmNhbGxlZSgpCkBAIC0xNDgsMTQgKzE0NiwxMiBAQCB2b2lkIENhbGxMaW5r SW5mbzo6c2V0Q29kZUJsb2NrKFZNJiB2bSwgSlNDZWxsKiBvd25lciwgRnVuY3Rpb25Db2RlQmxv Y2sqIGNvZGVCbAogewogICAgIFJFTEVBU0VfQVNTRVJUKGlzRGlyZWN0KCkpOwogICAgIG1fY2Fs bGVlT3JDb2RlQmxvY2suc2V0TWF5QmVOdWxsKHZtLCBvd25lciwgY29kZUJsb2NrKTsKLSAgICBt X2lzTGlua2VkID0gdHJ1ZTsKIH0KIAogdm9pZCBDYWxsTGlua0luZm86OmNsZWFyQ29kZUJsb2Nr KCkKIHsKICAgICBSRUxFQVNFX0FTU0VSVChpc0RpcmVjdCgpKTsKICAgICBtX2NhbGxlZU9yQ29k ZUJsb2NrLmNsZWFyKCk7Ci0gICAgbV9pc0xpbmtlZCA9IGZhbHNlOwogfQogCiBGdW5jdGlvbkNv ZGVCbG9jayogQ2FsbExpbmtJbmZvOjpjb2RlQmxvY2soKQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5oCmluZGV4IDgwMTg5NTVmYWUzNDIxZGFmOTc3MjJj ODllMDk4ZDdmYTVlMjJjMjcuLmEwYjIwN2Y1MjhkMzZmNmZmN2EwNDM3OTA4NDU3ZmE5MjU5ZTIw ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9DYWxsTGlua0lu Zm8uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ2FsbExpbmtJbmZvLmgK QEAgLTI3MCwxMCArMjcwLDIwIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1fY2xlYXJlZEJ5 VmlydHVhbDsKICAgICB9CiAKKyAgICBib29sIGNsZWFyZWRCeUpldHRpc29uKCkKKyAgICB7Cisg ICAgICAgIHJldHVybiBtX2NsZWFyZWRCeUpldHRpc29uOworICAgIH0KKwogICAgIHZvaWQgc2V0 Q2xlYXJlZEJ5VmlydHVhbCgpCiAgICAgewogICAgICAgICBtX2NsZWFyZWRCeVZpcnR1YWwgPSB0 cnVlOwogICAgIH0KKworICAgIHZvaWQgc2V0Q2xlYXJlZEJ5SmV0dGlzb24oKQorICAgIHsKKyAg ICAgICAgbV9jbGVhcmVkQnlKZXR0aXNvbiA9IHRydWU7CisgICAgfQogICAgIAogICAgIHZvaWQg c2V0Q2FsbFR5cGUoQ2FsbFR5cGUgY2FsbFR5cGUpCiAgICAgewpAQCAtMzUwLDcgKzM2MCw3IEBA IHByaXZhdGU6CiAgICAgYm9vbCBtX2NsZWFyZWRCeUdDIDogMTsKICAgICBib29sIG1fY2xlYXJl ZEJ5VmlydHVhbCA6IDE7CiAgICAgYm9vbCBtX2FsbG93U3R1YnMgOiAxOwotICAgIGJvb2wgbV9p c0xpbmtlZCA6IDE7CisgICAgYm9vbCBtX2NsZWFyZWRCeUpldHRpc29uIDogMTsKICAgICB1bnNp Z25lZCBtX2NhbGxUeXBlIDogNDsgLy8gQ2FsbFR5cGUKICAgICB1bnNpZ25lZCBtX2NhbGxlZUdQ UiA6IDg7CiAgICAgdWludDMyX3QgbV9tYXhOdW1Bcmd1bWVudHM7IC8vIEZvciB2YXJhcmdzOiB0 aGUgcHJvZmlsZWQgbWF4aW11bSBudW1iZXIgb2YgYXJndW1lbnRzLiBGb3IgZGlyZWN0OiB0aGUg bnVtYmVyIG9mIHN0YWNrIHNsb3RzIGFsbG9jYXRlZCBmb3IgYXJndW1lbnRzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAppbmRleCA2Mjg5YTU2MzRmNTNj YTFlNjRiNjczYjdiZGU2NDIwYjBlOTI4MjQyLi4xOTFkNGQxNWI5OGQ2NjgwZjc5YzZhMjg2M2Vj YjlkMTdmMjcyMGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJs b2NrLmNwcApAQCAtMjA0NSw2ICsyMDQ1LDE0IEBAIHZvaWQgQ29kZUJsb2NrOjpqZXR0aXNvbihQ cm9maWxlcjo6SmV0dGlzb25SZWFzb24gcmVhc29uLCBSZW9wdGltaXphdGlvbk1vZGUgbW9kCiAg ICAgaWYgKHZtLmhlYXAuaXNDdXJyZW50VGhyZWFkQnVzeSgpICYmICFIZWFwOjppc01hcmtlZChv d25lckV4ZWN1dGFibGUoKSkpCiAgICAgICAgIHJldHVybjsKIAorICAgIHsKKyAgICAgICAgQ29u Y3VycmVudEpTTG9ja2VyIGxvY2tlcihtX2xvY2spOworICAgICAgICBpZiAoSklURGF0YSogaml0 RGF0YSA9IG1faml0RGF0YS5nZXQoKSkgeworICAgICAgICAgICAgZm9yIChDYWxsTGlua0luZm8q IGNhbGxMaW5rSW5mbyA6IGppdERhdGEtPm1fY2FsbExpbmtJbmZvcykKKyAgICAgICAgICAgICAg ICBjYWxsTGlua0luZm8tPnNldENsZWFyZWRCeUpldHRpc29uKCk7CisgICAgICAgIH0KKyAgICB9 CisKICAgICAvLyBUaGlzIGFjY29tcGxpc2hlcyAoMikuCiAgICAgb3duZXJFeGVjdXRhYmxlKCkt Pmluc3RhbGxDb2RlKHZtLCBhbHRlcm5hdGl2ZSgpLCBjb2RlVHlwZSgpLCBzcGVjaWFsaXphdGlv bktpbmQoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRj aC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCmluZGV4IDMwMjhl MzYxNjYyMDA4MWExMmQ0NzlhMzI3MDMxNWM3ZTUyYWQ2YTguLjQ4YWY2ODljMjBlODY4MGUwNWE5 YTQ3YmQ4MTY4ZTg1NTFjZmJmYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvUmVwYXRjaC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNw cApAQCAtODk1LDE4ICs4OTUsMjAgQEAgdm9pZCBsaW5rU2xvd0ZvcigKIAogc3RhdGljIHZvaWQg cmV2ZXJ0Q2FsbChWTSogdm0sIENhbGxMaW5rSW5mbyYgY2FsbExpbmtJbmZvLCBNYWNyb0Fzc2Vt YmxlckNvZGVSZWY8SklUU3R1YlJvdXRpbmVQdHJUYWc+IGNvZGVSZWYpCiB7Ci0gICAgaWYgKGNh bGxMaW5rSW5mby5pc0RpcmVjdCgpKSB7Ci0gICAgICAgIGNhbGxMaW5rSW5mby5jbGVhckNvZGVC bG9jaygpOwotICAgICAgICBpZiAoY2FsbExpbmtJbmZvLmNhbGxUeXBlKCkgPT0gQ2FsbExpbmtJ bmZvOjpEaXJlY3RUYWlsQ2FsbCkKLSAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpyZXBhdGNo SnVtcChjYWxsTGlua0luZm8ucGF0Y2hhYmxlSnVtcCgpLCBjYWxsTGlua0luZm8uc2xvd1BhdGhT dGFydCgpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OnJlcGF0 Y2hOZWFyQ2FsbChjYWxsTGlua0luZm8uaG90UGF0aE90aGVyKCksIGNhbGxMaW5rSW5mby5zbG93 UGF0aFN0YXJ0KCkpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIE1hY3JvQXNzZW1ibGVyOjpyZXZl cnRKdW1wUmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRjaCgKLSAgICAgICAgICAgIE1hY3Jv QXNzZW1ibGVyOjpzdGFydE9mQnJhbmNoUHRyV2l0aFBhdGNoT25SZWdpc3RlcihjYWxsTGlua0lu Zm8uaG90UGF0aEJlZ2luKCkpLAotICAgICAgICAgICAgc3RhdGljX2Nhc3Q8TWFjcm9Bc3NlbWJs ZXI6OlJlZ2lzdGVySUQ+KGNhbGxMaW5rSW5mby5jYWxsZWVHUFIoKSksIDApOwotICAgICAgICBs aW5rU2xvd0Zvcih2bSwgY2FsbExpbmtJbmZvLCBjb2RlUmVmKTsKLSAgICAgICAgY2FsbExpbmtJ bmZvLmNsZWFyQ2FsbGVlKCk7CisgICAgaWYgKCFjYWxsTGlua0luZm8uY2xlYXJlZEJ5SmV0dGlz b24oKSkgeworICAgICAgICBpZiAoY2FsbExpbmtJbmZvLmlzRGlyZWN0KCkpIHsKKyAgICAgICAg ICAgIGNhbGxMaW5rSW5mby5jbGVhckNvZGVCbG9jaygpOworICAgICAgICAgICAgaWYgKGNhbGxM aW5rSW5mby5jYWxsVHlwZSgpID09IENhbGxMaW5rSW5mbzo6RGlyZWN0VGFpbENhbGwpCisgICAg ICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OnJlcGF0Y2hKdW1wKGNhbGxMaW5rSW5mby5wYXRj aGFibGVKdW1wKCksIGNhbGxMaW5rSW5mby5zbG93UGF0aFN0YXJ0KCkpOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpyZXBhdGNoTmVhckNhbGwoY2Fs bExpbmtJbmZvLmhvdFBhdGhPdGhlcigpLCBjYWxsTGlua0luZm8uc2xvd1BhdGhTdGFydCgpKTsK KyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpyZXZlcnRKdW1w UmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRjaCgKKyAgICAgICAgICAgICAgICBNYWNyb0Fz c2VtYmxlcjo6c3RhcnRPZkJyYW5jaFB0cldpdGhQYXRjaE9uUmVnaXN0ZXIoY2FsbExpbmtJbmZv LmhvdFBhdGhCZWdpbigpKSwKKyAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxNYWNyb0Fzc2Vt Ymxlcjo6UmVnaXN0ZXJJRD4oY2FsbExpbmtJbmZvLmNhbGxlZUdQUigpKSwgMCk7CisgICAgICAg ICAgICBsaW5rU2xvd0Zvcih2bSwgY2FsbExpbmtJbmZvLCBjb2RlUmVmKTsKKyAgICAgICAgICAg IGNhbGxMaW5rSW5mby5jbGVhckNhbGxlZSgpOworICAgICAgICB9CiAgICAgfQogICAgIGNhbGxM aW5rSW5mby5jbGVhclNlZW4oKTsKICAgICBjYWxsTGlua0luZm8uY2xlYXJTdHViKCk7CmRpZmYg LS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZiZGUx ZGVmMDlhZWQwZmJjY2IyZWM0MzY1ZjQ1NmQ0ZTFkNDU4YzUuLjI5OTZkNDAxNjExZjE4YzdjMTU4 MjhmZDg0YzBlYzNkMjg0MTUzMjUgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBi L0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDMtMjggIFRhZGV1IFph Z2FsbG8gIDx0emFnYWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgQ29kZUJsb2NrOjpqZXR0aXNv bigpIHNob3VsZCBkaXNhbGxvdyByZXBhdGNoaW5nIGl0cyBvd24gY2FsbHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjM1OQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDg5NzM2NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBzdHJlc3MvY2FsbC1saW5rLWluZm8tb3NyZXhpdC1yZXBhdGNoLmpz OiBBZGRlZC4KKyAgICAgICAgKGZvbyk6CisKIDIwMTktMDMtMjUgIEtlaXRoIE1pbGxlciAgPGtl aXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV9vcCA9 PSBDb21wYXJlU3RyaWN0RXEgaW4gSlNDOjpERkc6Ok5vZGU6OmNvbnZlcnRUb0NvbXBhcmVFcVB0 cihKU0M6OkRGRzo6RnJvemVuVmFsdWUgKiwgSlNDOjpERkc6OkVkZ2UpCmRpZmYgLS1naXQgYS9K U1Rlc3RzL3N0cmVzcy9jYWxsLWxpbmstaW5mby1vc3JleGl0LXJlcGF0Y2guanMgYi9KU1Rlc3Rz L3N0cmVzcy9jYWxsLWxpbmstaW5mby1vc3JleGl0LXJlcGF0Y2guanMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGQ0 MzBjOTZlMDhlYTc2MmQxNDQwOTc5YWIyZWJiOGUzY2E1MGI3NwotLS0gL2Rldi9udWxsCisrKyBi L0pTVGVzdHMvc3RyZXNzL2NhbGwtbGluay1pbmZvLW9zcmV4aXQtcmVwYXRjaC5qcwpAQCAtMCww ICsxLDE4IEBACisvL0AgcnVuRlRMRWFnZXIoIi0td2F0Y2hkb2c9MTAwMCIsICItLXdhdGNoZG9n LWV4Y2VwdGlvbi1vayIpCisKK2Z1bmN0aW9uIGZvbyhhLCBiKSB7CisgICd1c2Ugc3RyaWN0JzsK KyAgaWYgKGEgPT09IDApIHsKKyAgICByZXR1cm47CisgIH0KKyAgaWYgKGEgPT09IDApIHsKKyAg ICByZXR1cm4gZm9vKGEgKyAwKTsKKyAgfQorICBpZiAoYSA9PT0gMCkgeworICAgIHJldHVybiBm b28oK2EsIDApOworICB9CisgIHJldHVybiBmb28oYiAvIDEsIGEsIDApOworICAwID09PSAwCit9 CisKK2ZvbygxLCA1KTsK 366203 2019-03-28 14:25:57 -0700 2019-03-28 15:05:40 -0700 Patch for landing bug-196359-20190328222555.patch text/plain 8889 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 M2Y4YTllMTYzOTc5MTc4NzM5ODY4MmJhZWIzYzQzNjU0ZDI2Zjk0Li4yNTllYmQ5OGNjZjdlMGJi MmQ5ZTExZDFkZTU1ZWM5OGYwMDhmNzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxOS0wMy0yOCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBDb2RlQmxvY2s6OmpldHRpc29uKCkgc2hvdWxkIGRpc2FsbG93IHJlcGF0 Y2hpbmcgaXRzIG93biBjYWxscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTk2MzU5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODk3MzY2Mz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBTYWFtIEJhcmF0aS4KKworICAgICAgICBDb2RlQmxvY2s6Ompl dHRpc29uKCkgY2FsbHMgQ29tbW9uRGF0YTo6aW52YWxpZGF0ZSwgd2hpY2ggcmVwbGFjZXMgdGhl IGBobHRgCisgICAgICAgIGluc3RydWN0aW9uIHdpdGggdGhlIGp1bXAgdG8gT1NSIGV4aXQuIEhv d2V2ZXIsIGlmIHRoZSBgaGx0YCB3YXMgaW1tZWRpYXRlbHkKKyAgICAgICAgZm9sbG93ZWQgYnkg YSBjYWxsIHRvIHRoZSBDb2RlQmxvY2sgYmVpbmcgamV0dGlzb25lZCwgd2Ugd291bGQgd3JpdGUg b3ZlciB0aGUKKyAgICAgICAgT1NSIGV4aXQgYWRkcmVzcyB3aGlsZSB1bmxpbmtpbmcgYWxsIHRo ZSBpbmNvbWluZyBDYWxsTGlua0luZm9zIGxhdGVyIGluCisgICAgICAgIENvZGVCbG9jazo6amV0 dGlzb24oKS4KKworICAgICAgICBDaGFuZ2UgaXQgc28gdGhhdCB3ZSBzZXQgYSBmbGFnLCBgY2xl YXJlZEJ5SmV0dGlzb25gLCBpbiBhbGwgdGhlIENhbGxMaW5rSW5mb3MKKyAgICAgICAgb3duZWQg YnkgdGhlIENvZGVCbG9jayBiZWluZyBqZXR0aXNvbmVkLiBJZiB0aGUgZmxhZyBpcyBzZXQsIHdl IHdpbGwgYXZvaWQKKyAgICAgICAgcmVwYXRjaGluZyB0aGUgY2FsbCBkdXJpbmcgdW5saW5raW5n LiBUaGlzIGlzIHNhZmUgYmVjYXVzZSB0aGlzIGNhbGwgd2lsbCBuZXZlcgorICAgICAgICBiZSBy ZWFjaGFibGUgYWdhaW4gYWZ0ZXIgdGhlIENvZGVCbG9jayBpcyBqZXR0aXNvbmVkLgorCisgICAg ICAgICogYnl0ZWNvZGUvQ2FsbExpbmtJbmZvLmNwcDoKKyAgICAgICAgKEpTQzo6Q2FsbExpbmtJ bmZvOjpDYWxsTGlua0luZm8pOgorICAgICAgICAoSlNDOjpDYWxsTGlua0luZm86OnNldENhbGxl ZSk6CisgICAgICAgIChKU0M6OkNhbGxMaW5rSW5mbzo6Y2xlYXJDYWxsZWUpOgorICAgICAgICAo SlNDOjpDYWxsTGlua0luZm86OnNldENvZGVCbG9jayk6CisgICAgICAgIChKU0M6OkNhbGxMaW5r SW5mbzo6Y2xlYXJDb2RlQmxvY2spOgorICAgICAgICAqIGJ5dGVjb2RlL0NhbGxMaW5rSW5mby5o OgorICAgICAgICAoSlNDOjpDYWxsTGlua0luZm86OmNsZWFyZWRCeUpldHRpc29uKToKKyAgICAg ICAgKEpTQzo6Q2FsbExpbmtJbmZvOjpzZXRDbGVhcmVkQnlKZXR0aXNvbik6CisgICAgICAgICog Ynl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpqZXR0aXNv bik6CisgICAgICAgICogaml0L1JlcGF0Y2guY3BwOgorICAgICAgICAoSlNDOjpyZXZlcnRDYWxs KToKKwogMjAxOS0wMy0yNSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4K IAogICAgICAgICBBU1NFUlRJT04gRkFJTEVEOiBtX29wID09IENvbXBhcmVTdHJpY3RFcSBpbiBK U0M6OkRGRzo6Tm9kZTo6Y29udmVydFRvQ29tcGFyZUVxUHRyKEpTQzo6REZHOjpGcm96ZW5WYWx1 ZSAqLCBKU0M6OkRGRzo6RWRnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9DYWxsTGlua0luZm8uY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0NhbGxMaW5rSW5mby5jcHAKaW5kZXggYzBhMzc3ODU2YjI2ZTVkYTA5YmMzYmNhZDFiYWMwZGE1 MzlhZTg5My4uZjM4YzAzN2QxNTBhOGU5ZjI4OGY3NGE0NmMxNGEzMDVhY2FkMWZkNiAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5jcHAKQEAgLTYx LDcgKzYxLDcgQEAgQ2FsbExpbmtJbmZvOjpDYWxsTGlua0luZm8oKQogICAgICwgbV9jbGVhcmVk QnlHQyhmYWxzZSkKICAgICAsIG1fY2xlYXJlZEJ5VmlydHVhbChmYWxzZSkKICAgICAsIG1fYWxs b3dTdHVicyh0cnVlKQotICAgICwgbV9pc0xpbmtlZChmYWxzZSkKKyAgICAsIG1fY2xlYXJlZEJ5 SmV0dGlzb24oZmFsc2UpCiAgICAgLCBtX2NhbGxUeXBlKE5vbmUpCiAgICAgLCBtX2NhbGxlZUdQ UigyNTUpCiAgICAgLCBtX21heE51bUFyZ3VtZW50cygwKQpAQCAtMTI3LDcgKzEyNyw2IEBAIHZv aWQgQ2FsbExpbmtJbmZvOjpzZXRDYWxsZWUoVk0mIHZtLCBKU0NlbGwqIG93bmVyLCBKU09iamVj dCogY2FsbGVlKQogICAgIFJFTEVBU0VfQVNTRVJUKCFpc0RpcmVjdCgpKTsKICAgICBNYWNyb0Fz c2VtYmxlcjo6cmVwYXRjaFBvaW50ZXIoaG90UGF0aEJlZ2luKCksIGNhbGxlZSk7CiAgICAgbV9j YWxsZWVPckNvZGVCbG9jay5zZXQodm0sIG93bmVyLCBjYWxsZWUpOwotICAgIG1faXNMaW5rZWQg PSB0cnVlOwogfQogCiB2b2lkIENhbGxMaW5rSW5mbzo6Y2xlYXJDYWxsZWUoKQpAQCAtMTM1LDcg KzEzNCw2IEBAIHZvaWQgQ2FsbExpbmtJbmZvOjpjbGVhckNhbGxlZSgpCiAgICAgUkVMRUFTRV9B U1NFUlQoIWlzRGlyZWN0KCkpOwogICAgIE1hY3JvQXNzZW1ibGVyOjpyZXBhdGNoUG9pbnRlciho b3RQYXRoQmVnaW4oKSwgbnVsbHB0cik7CiAgICAgbV9jYWxsZWVPckNvZGVCbG9jay5jbGVhcigp OwotICAgIG1faXNMaW5rZWQgPSBmYWxzZTsKIH0KIAogSlNPYmplY3QqIENhbGxMaW5rSW5mbzo6 Y2FsbGVlKCkKQEAgLTE0OCwxNCArMTQ2LDEyIEBAIHZvaWQgQ2FsbExpbmtJbmZvOjpzZXRDb2Rl QmxvY2soVk0mIHZtLCBKU0NlbGwqIG93bmVyLCBGdW5jdGlvbkNvZGVCbG9jayogY29kZUJsCiB7 CiAgICAgUkVMRUFTRV9BU1NFUlQoaXNEaXJlY3QoKSk7CiAgICAgbV9jYWxsZWVPckNvZGVCbG9j ay5zZXRNYXlCZU51bGwodm0sIG93bmVyLCBjb2RlQmxvY2spOwotICAgIG1faXNMaW5rZWQgPSB0 cnVlOwogfQogCiB2b2lkIENhbGxMaW5rSW5mbzo6Y2xlYXJDb2RlQmxvY2soKQogewogICAgIFJF TEVBU0VfQVNTRVJUKGlzRGlyZWN0KCkpOwogICAgIG1fY2FsbGVlT3JDb2RlQmxvY2suY2xlYXIo KTsKLSAgICBtX2lzTGlua2VkID0gZmFsc2U7CiB9CiAKIEZ1bmN0aW9uQ29kZUJsb2NrKiBDYWxs TGlua0luZm86OmNvZGVCbG9jaygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvQ2FsbExpbmtJbmZvLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q2FsbExpbmtJbmZvLmgKaW5kZXggODAxODk1NWZhZTM0MjFkYWY5NzcyMmM4OWUwOThkN2ZhNWUy MmMyNy4uYTBiMjA3ZjUyOGQzNmY2ZmY3YTA0Mzc5MDg0NTdmYTkyNTllMjBkZSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9DYWxsTGlua0luZm8uaApAQCAtMjcwLDEwICsy NzAsMjAgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV9jbGVhcmVkQnlWaXJ0dWFsOwogICAg IH0KIAorICAgIGJvb2wgY2xlYXJlZEJ5SmV0dGlzb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJu IG1fY2xlYXJlZEJ5SmV0dGlzb247CisgICAgfQorCiAgICAgdm9pZCBzZXRDbGVhcmVkQnlWaXJ0 dWFsKCkKICAgICB7CiAgICAgICAgIG1fY2xlYXJlZEJ5VmlydHVhbCA9IHRydWU7CiAgICAgfQor CisgICAgdm9pZCBzZXRDbGVhcmVkQnlKZXR0aXNvbigpCisgICAgeworICAgICAgICBtX2NsZWFy ZWRCeUpldHRpc29uID0gdHJ1ZTsKKyAgICB9CiAgICAgCiAgICAgdm9pZCBzZXRDYWxsVHlwZShD YWxsVHlwZSBjYWxsVHlwZSkKICAgICB7CkBAIC0zNTAsNyArMzYwLDcgQEAgcHJpdmF0ZToKICAg ICBib29sIG1fY2xlYXJlZEJ5R0MgOiAxOwogICAgIGJvb2wgbV9jbGVhcmVkQnlWaXJ0dWFsIDog MTsKICAgICBib29sIG1fYWxsb3dTdHVicyA6IDE7Ci0gICAgYm9vbCBtX2lzTGlua2VkIDogMTsK KyAgICBib29sIG1fY2xlYXJlZEJ5SmV0dGlzb24gOiAxOwogICAgIHVuc2lnbmVkIG1fY2FsbFR5 cGUgOiA0OyAvLyBDYWxsVHlwZQogICAgIHVuc2lnbmVkIG1fY2FsbGVlR1BSIDogODsKICAgICB1 aW50MzJfdCBtX21heE51bUFyZ3VtZW50czsgLy8gRm9yIHZhcmFyZ3M6IHRoZSBwcm9maWxlZCBt YXhpbXVtIG51bWJlciBvZiBhcmd1bWVudHMuIEZvciBkaXJlY3Q6IHRoZSBudW1iZXIgb2Ygc3Rh Y2sgc2xvdHMgYWxsb2NhdGVkIGZvciBhcmd1bWVudHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCmluZGV4IDYyODlhNTYzNGY1M2NhMWU2NGI2NzNiN2Jk ZTY0MjBiMGU5MjgyNDIuLjgyOTcyMDNlNzAzYTczOTExY2MyZDY5ZGRlZTFhY2ZjN2RlM2I5OGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCkBAIC0y MDQ1LDYgKzIwNDUsMTYgQEAgdm9pZCBDb2RlQmxvY2s6OmpldHRpc29uKFByb2ZpbGVyOjpKZXR0 aXNvblJlYXNvbiByZWFzb24sIFJlb3B0aW1pemF0aW9uTW9kZSBtb2QKICAgICBpZiAodm0uaGVh cC5pc0N1cnJlbnRUaHJlYWRCdXN5KCkgJiYgIUhlYXA6OmlzTWFya2VkKG93bmVyRXhlY3V0YWJs ZSgpKSkKICAgICAgICAgcmV0dXJuOwogCisjaWYgRU5BQkxFKEpJVCkKKyAgICB7CisgICAgICAg IENvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIobV9sb2NrKTsKKyAgICAgICAgaWYgKEpJVERhdGEq IGppdERhdGEgPSBtX2ppdERhdGEuZ2V0KCkpIHsKKyAgICAgICAgICAgIGZvciAoQ2FsbExpbmtJ bmZvKiBjYWxsTGlua0luZm8gOiBqaXREYXRhLT5tX2NhbGxMaW5rSW5mb3MpCisgICAgICAgICAg ICAgICAgY2FsbExpbmtJbmZvLT5zZXRDbGVhcmVkQnlKZXR0aXNvbigpOworICAgICAgICB9Cisg ICAgfQorI2VuZGlmCisKICAgICAvLyBUaGlzIGFjY29tcGxpc2hlcyAoMikuCiAgICAgb3duZXJF eGVjdXRhYmxlKCktPmluc3RhbGxDb2RlKHZtLCBhbHRlcm5hdGl2ZSgpLCBjb2RlVHlwZSgpLCBz cGVjaWFsaXphdGlvbktpbmQoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvUmVwYXRjaC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3Bw CmluZGV4IDMwMjhlMzYxNjYyMDA4MWExMmQ0NzlhMzI3MDMxNWM3ZTUyYWQ2YTguLjQ4YWY2ODlj MjBlODY4MGUwNWE5YTQ3YmQ4MTY4ZTg1NTFjZmJmYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9SZXBhdGNoLmNwcApAQCAtODk1LDE4ICs4OTUsMjAgQEAgdm9pZCBsaW5rU2xvd0ZvcigKIAog c3RhdGljIHZvaWQgcmV2ZXJ0Q2FsbChWTSogdm0sIENhbGxMaW5rSW5mbyYgY2FsbExpbmtJbmZv LCBNYWNyb0Fzc2VtYmxlckNvZGVSZWY8SklUU3R1YlJvdXRpbmVQdHJUYWc+IGNvZGVSZWYpCiB7 Ci0gICAgaWYgKGNhbGxMaW5rSW5mby5pc0RpcmVjdCgpKSB7Ci0gICAgICAgIGNhbGxMaW5rSW5m by5jbGVhckNvZGVCbG9jaygpOwotICAgICAgICBpZiAoY2FsbExpbmtJbmZvLmNhbGxUeXBlKCkg PT0gQ2FsbExpbmtJbmZvOjpEaXJlY3RUYWlsQ2FsbCkKLSAgICAgICAgICAgIE1hY3JvQXNzZW1i bGVyOjpyZXBhdGNoSnVtcChjYWxsTGlua0luZm8ucGF0Y2hhYmxlSnVtcCgpLCBjYWxsTGlua0lu Zm8uc2xvd1BhdGhTdGFydCgpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgTWFjcm9Bc3Nl bWJsZXI6OnJlcGF0Y2hOZWFyQ2FsbChjYWxsTGlua0luZm8uaG90UGF0aE90aGVyKCksIGNhbGxM aW5rSW5mby5zbG93UGF0aFN0YXJ0KCkpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIE1hY3JvQXNz ZW1ibGVyOjpyZXZlcnRKdW1wUmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRjaCgKLSAgICAg ICAgICAgIE1hY3JvQXNzZW1ibGVyOjpzdGFydE9mQnJhbmNoUHRyV2l0aFBhdGNoT25SZWdpc3Rl cihjYWxsTGlua0luZm8uaG90UGF0aEJlZ2luKCkpLAotICAgICAgICAgICAgc3RhdGljX2Nhc3Q8 TWFjcm9Bc3NlbWJsZXI6OlJlZ2lzdGVySUQ+KGNhbGxMaW5rSW5mby5jYWxsZWVHUFIoKSksIDAp OwotICAgICAgICBsaW5rU2xvd0Zvcih2bSwgY2FsbExpbmtJbmZvLCBjb2RlUmVmKTsKLSAgICAg ICAgY2FsbExpbmtJbmZvLmNsZWFyQ2FsbGVlKCk7CisgICAgaWYgKCFjYWxsTGlua0luZm8uY2xl YXJlZEJ5SmV0dGlzb24oKSkgeworICAgICAgICBpZiAoY2FsbExpbmtJbmZvLmlzRGlyZWN0KCkp IHsKKyAgICAgICAgICAgIGNhbGxMaW5rSW5mby5jbGVhckNvZGVCbG9jaygpOworICAgICAgICAg ICAgaWYgKGNhbGxMaW5rSW5mby5jYWxsVHlwZSgpID09IENhbGxMaW5rSW5mbzo6RGlyZWN0VGFp bENhbGwpCisgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OnJlcGF0Y2hKdW1wKGNhbGxM aW5rSW5mby5wYXRjaGFibGVKdW1wKCksIGNhbGxMaW5rSW5mby5zbG93UGF0aFN0YXJ0KCkpOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpyZXBhdGNo TmVhckNhbGwoY2FsbExpbmtJbmZvLmhvdFBhdGhPdGhlcigpLCBjYWxsTGlua0luZm8uc2xvd1Bh dGhTdGFydCgpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVy OjpyZXZlcnRKdW1wUmVwbGFjZW1lbnRUb0JyYW5jaFB0cldpdGhQYXRjaCgKKyAgICAgICAgICAg ICAgICBNYWNyb0Fzc2VtYmxlcjo6c3RhcnRPZkJyYW5jaFB0cldpdGhQYXRjaE9uUmVnaXN0ZXIo Y2FsbExpbmtJbmZvLmhvdFBhdGhCZWdpbigpKSwKKyAgICAgICAgICAgICAgICBzdGF0aWNfY2Fz dDxNYWNyb0Fzc2VtYmxlcjo6UmVnaXN0ZXJJRD4oY2FsbExpbmtJbmZvLmNhbGxlZUdQUigpKSwg MCk7CisgICAgICAgICAgICBsaW5rU2xvd0Zvcih2bSwgY2FsbExpbmtJbmZvLCBjb2RlUmVmKTsK KyAgICAgICAgICAgIGNhbGxMaW5rSW5mby5jbGVhckNhbGxlZSgpOworICAgICAgICB9CiAgICAg fQogICAgIGNhbGxMaW5rSW5mby5jbGVhclNlZW4oKTsKICAgICBjYWxsTGlua0luZm8uY2xlYXJT dHViKCk7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9n CmluZGV4IGZiZGUxZGVmMDlhZWQwZmJjY2IyZWM0MzY1ZjQ1NmQ0ZTFkNDU4YzUuLjYyOGQwY2Vj ZjkyMzI0N2Y4YTU1MDY0ZTRmNzhkYTEwNzg3Zjg0OTAgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hh bmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDMt MjggIFRhZGV1IFphZ2FsbG8gIDx0emFnYWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgQ29kZUJs b2NrOjpqZXR0aXNvbigpIHNob3VsZCBkaXNhbGxvdyByZXBhdGNoaW5nIGl0cyBvd24gY2FsbHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjM1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg5NzM2NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg U2FhbSBCYXJhdGkuCisKKyAgICAgICAgKiBzdHJlc3MvY2FsbC1saW5rLWluZm8tb3NyZXhpdC1y ZXBhdGNoLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvbyk6CisKIDIwMTktMDMtMjUgIEtlaXRoIE1p bGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxF RDogbV9vcCA9PSBDb21wYXJlU3RyaWN0RXEgaW4gSlNDOjpERkc6Ok5vZGU6OmNvbnZlcnRUb0Nv bXBhcmVFcVB0cihKU0M6OkRGRzo6RnJvemVuVmFsdWUgKiwgSlNDOjpERkc6OkVkZ2UpCmRpZmYg LS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9jYWxsLWxpbmstaW5mby1vc3JleGl0LXJlcGF0Y2guanMg Yi9KU1Rlc3RzL3N0cmVzcy9jYWxsLWxpbmstaW5mby1vc3JleGl0LXJlcGF0Y2guanMKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYzI0N2IxODI2OTE5ZDI2NzU3NjAzYjNkN2I0NTk4MDllYTkzMTUzYQotLS0gL2Rldi9u dWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL2NhbGwtbGluay1pbmZvLW9zcmV4aXQtcmVwYXRjaC5q cwpAQCAtMCwwICsxLDE4IEBACisvL0AgcnVuRlRMRWFnZXIoIi0td2F0Y2hkb2c9MTAwMCIsICIt LXdhdGNoZG9nLWV4Y2VwdGlvbi1vayIpCisKK2Z1bmN0aW9uIGZvbyhhLCBiKSB7CisgICAgJ3Vz ZSBzdHJpY3QnOworICAgIGlmIChhID09PSAwKSB7CisgICAgICAgIHJldHVybjsKKyAgICB9Cisg ICAgaWYgKGEgPT09IDApIHsKKyAgICAgICAgcmV0dXJuIGZvbyhhICsgMCk7CisgICAgfQorICAg IGlmIChhID09PSAwKSB7CisgICAgICAgIHJldHVybiBmb28oK2EsIDApOworICAgIH0KKyAgICBy ZXR1cm4gZm9vKGIgLyAxLCBhLCAwKTsKKyAgICAwID09PSAwCit9CisKK2ZvbygxLCA1KTsK