227964 2021-07-14 12:50:55 -0700 Speculative fix for failed scope.releaseAssertNoException() after calls to JSMap::create(). 2021-07-14 15:11:18 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1777003 0 mark.lam 2021-07-14 12:50:55 -0700 There have been reports of flaky failures on the scope.releaseAssertNoException() after the call to JSMap::create() in JSModuleLoader::finishCreation(). The scope.releaseAssertNoException() says that we don't expect the JSMap::create() to ever throw an exception. If the assertion is true, the only way that we can see an exception there is if we're throwing an asynchronous TerminationException. Since JSModuleLoader::finishCreation() does have any long running loops, we can just DeferTerminationForAWhile and let the next exception check site throw the asynchronous TerminationException. We don't want to just use DeferTermination because it will throw the TerminationException right at the end of JSModuleLoader::finishCreation(), and the caller of JSModuleLoader::finishCreation() may be similarly not expecting an exception to be thrown there. Also apply the same treatment to AbstractModuleRecord::finishCreation(), and getBackingMap() in WebCore for the same reason. Other than those, other sites that call JSMap::create() already check for exceptions. So, those sites do not need to DeferTerminationForAWhile. rdar://78013960 1777008 1 433520 mark.lam 2021-07-14 12:59:12 -0700 Created attachment 433520 proposed patch. 1777011 2 433522 mark.lam 2021-07-14 13:03:44 -0700 Created attachment 433522 proposed patch. 1777014 3 433522 ysuzuki 2021-07-14 13:19:58 -0700 Comment on attachment 433522 proposed patch. r=me 1777055 4 mark.lam 2021-07-14 15:07:04 -0700 Thanks for the review. I'm pretty sure the jsc test failures are due to Keith's patch, which he just landed a fix for. So, I'm going to land this one. 1777059 5 mark.lam 2021-07-14 15:11:18 -0700 Landed in r279924: <http://trac.webkit.org/r279924>. 433520 2021-07-14 12:59:12 -0700 2021-07-14 13:02:32 -0700 proposed patch. bug-227964.patch text/plain 4622 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc5OTE1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDIxLTA3LTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT cGVjdWxhdGl2ZSBmaXggZm9yIGZhaWxlZCBzY29wZS5yZWxlYXNlQXNzZXJ0Tm9FeGNlcHRpb24o KSBhZnRlciBjYWxscyB0byBKU01hcDo6Y3JlYXRlKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjQKKyAgICAgICAgcmRhcjovLzc4MDEzOTYw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUg aGF2ZSBiZWVuIHJlcG9ydHMgb2YgZmxha3kgZmFpbHVyZXMgb24gdGhlIHNjb3BlLnJlbGVhc2VB c3NlcnROb0V4Y2VwdGlvbigpCisgICAgICAgIGFmdGVyIHRoZSBjYWxsIHRvIEpTTWFwOjpjcmVh dGUoKSBpbiBKU01vZHVsZUxvYWRlcjo6ZmluaXNoQ3JlYXRpb24oKS4KKworICAgICAgICBUaGUg c2NvcGUucmVsZWFzZUFzc2VydE5vRXhjZXB0aW9uKCkgc2F5cyB0aGF0IHdlIGRvbid0IGV4cGVj dCB0aGUgSlNNYXA6OmNyZWF0ZSgpCisgICAgICAgIHRvIGV2ZXIgdGhyb3cgYW4gZXhjZXB0aW9u LiAgSWYgdGhlIGFzc2VydGlvbiBpcyB0cnVlLCB0aGUgb25seSB3YXkgdGhhdCB3ZSBjYW4KKyAg ICAgICAgc2VlIGFuIGV4Y2VwdGlvbiB0aGVyZSBpcyBpZiB3ZSdyZSB0aHJvd2luZyBhbiBhc3lu Y2hyb25vdXMgVGVybWluYXRpb25FeGNlcHRpb24uCisKKyAgICAgICAgU2luY2UgSlNNb2R1bGVM b2FkZXI6OmZpbmlzaENyZWF0aW9uKCkgZG9lcyBub3QgaGF2ZSBhbnkgbG9uZyBydW5uaW5nIGxv b3BzLCB3ZSBjYW4KKyAgICAgICAganVzdCBEZWZlclRlcm1pbmF0aW9uRm9yQVdoaWxlIGFuZCBs ZXQgdGhlIG5leHQgZXhjZXB0aW9uIGNoZWNrIHNpdGUgdGhyb3cgdGhlCisgICAgICAgIGFzeW5j aHJvbm91cyBUZXJtaW5hdGlvbkV4Y2VwdGlvbi4gIFdlIGRvbid0IHdhbnQgdG8ganVzdCB1c2Ug RGVmZXJUZXJtaW5hdGlvbgorICAgICAgICBiZWNhdXNlIGl0IHdpbGwgdGhyb3cgdGhlIFRlcm1p bmF0aW9uRXhjZXB0aW9uIHJpZ2h0IGF0IHRoZSBlbmQgb2YKKyAgICAgICAgSlNNb2R1bGVMb2Fk ZXI6OmZpbmlzaENyZWF0aW9uKCksIGFuZCB0aGUgY2FsbGVyIG9mIEpTTW9kdWxlTG9hZGVyOjpm aW5pc2hDcmVhdGlvbigpCisgICAgICAgIG1heSBiZSBzaW1pbGFybHkgbm90IGV4cGVjdGluZyBh biBleGNlcHRpb24gdG8gYmUgdGhyb3duIHRoZXJlLgorCisgICAgICAgIEFsc28gYXBwbHkgdGhl IHNhbWUgdHJlYXRtZW50IHRvIEFic3RyYWN0TW9kdWxlUmVjb3JkOjpmaW5pc2hDcmVhdGlvbigp LCBhbmQKKyAgICAgICAgZ2V0QmFja2luZ01hcCgpIGluIFdlYkNvcmUgZm9yIHRoZSBzYW1lIHJl YXNvbi4gIE90aGVyIHRoYW4gdGhvc2UsIG90aGVyIHNpdGVzIHRoYXQKKyAgICAgICAgY2FsbCBK U01hcDo6Y3JlYXRlKCkgYWxyZWFkeSBjaGVjayBmb3IgZXhjZXB0aW9ucy4gIFNvLCB0aG9zZSBz aXRlcyBkbyBub3QgbmVlZCB0bworICAgICAgICBEZWZlclRlcm1pbmF0aW9uRm9yQVdoaWxlLgor CisgICAgICAgICogcnVudGltZS9BYnN0cmFjdE1vZHVsZVJlY29yZC5jcHA6CisgICAgICAgIChK U0M6OkFic3RyYWN0TW9kdWxlUmVjb3JkOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgICogcnVu dGltZS9KU01vZHVsZUxvYWRlci5jcHA6CisgICAgICAgIChKU0M6OkpTTW9kdWxlTG9hZGVyOjpm aW5pc2hDcmVhdGlvbik6CisKIDIwMjEtMDctMTQgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIENoZWNrIGZvciBvdXQgb2YgbWVtb3J5IGluIEpTQzo6Z2xvYmFsRnVu Y0VzY2FwZSgpIGFuZCBKU0M6Omdsb2JhbEZ1bmNVbmVzY2FwZSgpLgpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvQWJzdHJhY3RNb2R1bGVSZWNvcmQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Fic3RyYWN0TW9kdWxlUmVjb3JkLmNw cAkocmV2aXNpb24gMjc5OTE0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQWJz dHJhY3RNb2R1bGVSZWNvcmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCw4ICs1MCw4IEBAIEFi c3RyYWN0TW9kdWxlUmVjb3JkOjpBYnN0cmFjdE1vZHVsZVJlY28KIAogdm9pZCBBYnN0cmFjdE1v ZHVsZVJlY29yZDo6ZmluaXNoQ3JlYXRpb24oSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwg Vk0mIHZtKQogewotICAgIERlZmVyVGVybWluYXRpb24gZGVmZXJTY29wZSh2bSk7Ci0gICAgYXV0 byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOworICAgIERlZmVyVGVybWluYXRpb25G b3JBV2hpbGUgZGVmZXJTY29wZSh2bSk7CisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfQ0FUQ0hf U0NPUEUodm0pOwogCiAgICAgQmFzZTo6ZmluaXNoQ3JlYXRpb24odm0pOwogICAgIEFTU0VSVChp bmhlcml0cyh2bSwgaW5mbygpKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU01vZHVsZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNNb2R1bGVMb2FkZXIuY3BwCShyZXZpc2lvbiAyNzk5MTQpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU01vZHVsZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTk4LDYgKzk4LDcgQEAgSlNNb2R1bGVMb2FkZXI6OkpTTW9kdWxlTG9hZGVyKFZNJiB2bSwg UwogCiB2b2lkIEpTTW9kdWxlTG9hZGVyOjpmaW5pc2hDcmVhdGlvbihKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBWTSYgdm0pCiB7CisgICAgRGVmZXJUZXJtaW5hdGlvbkZvckFXaGlsZSBk ZWZlclNjb3BlKHZtKTsKICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9DQVRDSF9TQ09QRSh2bSk7 CiAKICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbih2bSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lv biAyNzk5MTQpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNCBAQAorMjAyMS0wNy0xNCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+ CisKKyAgICAgICAgU3BlY3VsYXRpdmUgZml4IGZvciBmYWlsZWQgc2NvcGUucmVsZWFzZUFzc2Vy dE5vRXhjZXB0aW9uKCkgYWZ0ZXIgY2FsbHMgdG8gSlNNYXA6OmNyZWF0ZSgpLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3OTY0CisgICAgICAgIHJk YXI6Ly83ODAxMzk2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogYmluZGluZ3MvanMvSlNET01NYXBMaWtlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmdldEJhY2tpbmdNYXApOgorCiAyMDIxLTA3LTE0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBSRUdSRVNTSU9OKHIyNzk3MjApOiBjaGFuZ2luZyBT dWJ0aXRsZXMgdG8gT2ZmIGRvZXNuJ3QgaGlkZSB0aGVtIG9yIGRvIGFueXRoaW5nCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTU1hcExpa2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NTWFwTGlrZS5jcHAJKHJldmlzaW9uIDI3 OTkxNCkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NTWFwTGlrZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQwLDcgKzQwLDcgQEAgc3RkOjpwYWlyPGJvb2wsIHN0ZDo6cmVmZXJl bmNlX3dyYXBwZXI8SgogICAgIGlmICghYmFja2luZ01hcC5pc1VuZGVmaW5lZCgpKQogICAgICAg ICByZXR1cm4geyBmYWxzZSwgKkpTQzo6YXNPYmplY3QoYmFja2luZ01hcCkgfTsKIAotICAgIEpT Qzo6RGVmZXJUZXJtaW5hdGlvbiBkZWZlclNjb3BlKHZtKTsKKyAgICBKU0M6OkRlZmVyVGVybWlu YXRpb25Gb3JBV2hpbGUgZGVmZXJTY29wZSh2bSk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVf Q0FUQ0hfU0NPUEUodm0pOwogCiAgICAgYmFja2luZ01hcCA9IEpTQzo6SlNNYXA6OmNyZWF0ZSgm bGV4aWNhbEdsb2JhbE9iamVjdCwgdm0sIGxleGljYWxHbG9iYWxPYmplY3QubWFwU3RydWN0dXJl KCkpOwo= 433522 2021-07-14 13:03:44 -0700 2021-07-14 13:19:58 -0700 proposed patch. bug-227964.patch text/plain 4974 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc5OTE1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDIxLTA3LTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT cGVjdWxhdGl2ZSBmaXggZm9yIGZhaWxlZCBzY29wZS5yZWxlYXNlQXNzZXJ0Tm9FeGNlcHRpb24o KSBhZnRlciBjYWxscyB0byBKU01hcDo6Y3JlYXRlKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc5NjQKKyAgICAgICAgcmRhcjovLzc4MDEzOTYw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUg aGF2ZSBiZWVuIHJlcG9ydHMgb2YgZmxha3kgZmFpbHVyZXMgb24gdGhlIHNjb3BlLnJlbGVhc2VB c3NlcnROb0V4Y2VwdGlvbigpCisgICAgICAgIGFmdGVyIHRoZSBjYWxsIHRvIEpTTWFwOjpjcmVh dGUoKSBpbiBKU01vZHVsZUxvYWRlcjo6ZmluaXNoQ3JlYXRpb24oKS4KKworICAgICAgICBUaGUg c2NvcGUucmVsZWFzZUFzc2VydE5vRXhjZXB0aW9uKCkgc2F5cyB0aGF0IHdlIGRvbid0IGV4cGVj dCB0aGUgSlNNYXA6OmNyZWF0ZSgpCisgICAgICAgIHRvIGV2ZXIgdGhyb3cgYW4gZXhjZXB0aW9u LiAgSWYgdGhlIGFzc2VydGlvbiBpcyB0cnVlLCB0aGUgb25seSB3YXkgdGhhdCB3ZSBjYW4KKyAg ICAgICAgc2VlIGFuIGV4Y2VwdGlvbiB0aGVyZSBpcyBpZiB3ZSdyZSB0aHJvd2luZyBhbiBhc3lu Y2hyb25vdXMgVGVybWluYXRpb25FeGNlcHRpb24uCisKKyAgICAgICAgU2luY2UgSlNNb2R1bGVM b2FkZXI6OmZpbmlzaENyZWF0aW9uKCkgZG9lcyBub3QgaGF2ZSBhbnkgbG9uZyBydW5uaW5nIGxv b3BzLCB3ZSBjYW4KKyAgICAgICAganVzdCBEZWZlclRlcm1pbmF0aW9uRm9yQVdoaWxlIGFuZCBs ZXQgdGhlIG5leHQgZXhjZXB0aW9uIGNoZWNrIHNpdGUgdGhyb3cgdGhlCisgICAgICAgIGFzeW5j aHJvbm91cyBUZXJtaW5hdGlvbkV4Y2VwdGlvbi4gIFdlIGRvbid0IHdhbnQgdG8ganVzdCB1c2Ug RGVmZXJUZXJtaW5hdGlvbgorICAgICAgICBiZWNhdXNlIGl0IHdpbGwgdGhyb3cgdGhlIFRlcm1p bmF0aW9uRXhjZXB0aW9uIHJpZ2h0IGF0IHRoZSBlbmQgb2YKKyAgICAgICAgSlNNb2R1bGVMb2Fk ZXI6OmZpbmlzaENyZWF0aW9uKCksIGFuZCB0aGUgY2FsbGVyIG9mIEpTTW9kdWxlTG9hZGVyOjpm aW5pc2hDcmVhdGlvbigpCisgICAgICAgIG1heSBiZSBzaW1pbGFybHkgbm90IGV4cGVjdGluZyBh biBleGNlcHRpb24gdG8gYmUgdGhyb3duIHRoZXJlLgorCisgICAgICAgIEFsc28gYXBwbHkgdGhl IHNhbWUgdHJlYXRtZW50IHRvIEFic3RyYWN0TW9kdWxlUmVjb3JkOjpmaW5pc2hDcmVhdGlvbigp LCBhbmQKKyAgICAgICAgZ2V0QmFja2luZ01hcCgpIGluIFdlYkNvcmUgZm9yIHRoZSBzYW1lIHJl YXNvbi4gIE90aGVyIHRoYW4gdGhvc2UsIG90aGVyIHNpdGVzIHRoYXQKKyAgICAgICAgY2FsbCBK U01hcDo6Y3JlYXRlKCkgYWxyZWFkeSBjaGVjayBmb3IgZXhjZXB0aW9ucy4gIFNvLCB0aG9zZSBz aXRlcyBkbyBub3QgbmVlZCB0bworICAgICAgICBEZWZlclRlcm1pbmF0aW9uRm9yQVdoaWxlLgor CisgICAgICAgICogcnVudGltZS9BYnN0cmFjdE1vZHVsZVJlY29yZC5jcHA6CisgICAgICAgIChK U0M6OkFic3RyYWN0TW9kdWxlUmVjb3JkOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgICogcnVu dGltZS9KU01vZHVsZUxvYWRlci5jcHA6CisgICAgICAgIChKU0M6OkpTTW9kdWxlTG9hZGVyOjpm aW5pc2hDcmVhdGlvbik6CisKIDIwMjEtMDctMTQgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIENoZWNrIGZvciBvdXQgb2YgbWVtb3J5IGluIEpTQzo6Z2xvYmFsRnVu Y0VzY2FwZSgpIGFuZCBKU0M6Omdsb2JhbEZ1bmNVbmVzY2FwZSgpLgpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvQWJzdHJhY3RNb2R1bGVSZWNvcmQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Fic3RyYWN0TW9kdWxlUmVjb3JkLmNw cAkocmV2aXNpb24gMjc5OTE0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQWJz dHJhY3RNb2R1bGVSZWNvcmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAj aW5jbHVkZSAiSlNNb2R1bGVFbnZpcm9ubWVudC5oIgogI2luY2x1ZGUgIkpTTW9kdWxlTmFtZXNw YWNlT2JqZWN0LmgiCiAjaW5jbHVkZSAiSlNNb2R1bGVSZWNvcmQuaCIKKyNpbmNsdWRlICJWTVRy YXBzSW5saW5lcy5oIgogI2luY2x1ZGUgIldlYkFzc2VtYmx5TW9kdWxlUmVjb3JkLmgiCiAKIG5h bWVzcGFjZSBKU0MgewpAQCAtNTAsOCArNTEsOCBAQCBBYnN0cmFjdE1vZHVsZVJlY29yZDo6QWJz dHJhY3RNb2R1bGVSZWNvCiAKIHZvaWQgQWJzdHJhY3RNb2R1bGVSZWNvcmQ6OmZpbmlzaENyZWF0 aW9uKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFZNJiB2bSkKIHsKLSAgICBEZWZlclRl cm1pbmF0aW9uIGRlZmVyU2NvcGUodm0pOwotICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9X X1NDT1BFKHZtKTsKKyAgICBEZWZlclRlcm1pbmF0aW9uRm9yQVdoaWxlIGRlZmVyU2NvcGUodm0p OworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX0NBVENIX1NDT1BFKHZtKTsKIAogICAgIEJhc2U6 OmZpbmlzaENyZWF0aW9uKHZtKTsKICAgICBBU1NFUlQoaW5oZXJpdHModm0sIGluZm8oKSkpOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVMb2FkZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTG9hZGVy LmNwcAkocmV2aXNpb24gMjc5OTE0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNNb2R1bGVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw3IEBACiAjaW5j bHVkZSAiT2JqZWN0Q29uc3RydWN0b3IuaCIKICNpbmNsdWRlICJQYXJzZXIuaCIKICNpbmNsdWRl ICJQYXJzZXJFcnJvci5oIgorI2luY2x1ZGUgIlZNVHJhcHNJbmxpbmVzLmgiCiAKIG5hbWVzcGFj ZSBKU0MgewogCkBAIC05OCw2ICs5OSw3IEBAIEpTTW9kdWxlTG9hZGVyOjpKU01vZHVsZUxvYWRl cihWTSYgdm0sIFMKIAogdm9pZCBKU01vZHVsZUxvYWRlcjo6ZmluaXNoQ3JlYXRpb24oSlNHbG9i YWxPYmplY3QqIGdsb2JhbE9iamVjdCwgVk0mIHZtKQogeworICAgIERlZmVyVGVybWluYXRpb25G b3JBV2hpbGUgZGVmZXJTY29wZSh2bSk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfQ0FUQ0hf U0NPUEUodm0pOwogCiAgICAgQmFzZTo6ZmluaXNoQ3JlYXRpb24odm0pOwpJbmRleDogU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwkocmV2aXNpb24gMjc5OTE0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDctMTQgIE1hcmsgTGFtICA8bWFyay5sYW1A YXBwbGUuY29tPgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZpeCBmb3IgZmFpbGVkIHNjb3BlLnJl bGVhc2VBc3NlcnROb0V4Y2VwdGlvbigpIGFmdGVyIGNhbGxzIHRvIEpTTWFwOjpjcmVhdGUoKS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk2NAor ICAgICAgICByZGFyOi8vNzgwMTM5NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NTWFwTGlrZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpnZXRCYWNraW5nTWFwKToKKwogMjAyMS0wNy0xNCAgRGV2aW4gUm91c3NvICA8 ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUkVHUkVTU0lPTihyMjc5NzIwKTog Y2hhbmdpbmcgU3VidGl0bGVzIHRvIE9mZiBkb2Vzbid0IGhpZGUgdGhlbSBvciBkbyBhbnl0aGlu ZwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01NYXBMaWtlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTU1hcExpa2UuY3BwCShy ZXZpc2lvbiAyNzk5MTQpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTU1hcExp a2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MCw3ICs0MCw3IEBAIHN0ZDo6cGFpcjxib29sLCBz dGQ6OnJlZmVyZW5jZV93cmFwcGVyPEoKICAgICBpZiAoIWJhY2tpbmdNYXAuaXNVbmRlZmluZWQo KSkKICAgICAgICAgcmV0dXJuIHsgZmFsc2UsICpKU0M6OmFzT2JqZWN0KGJhY2tpbmdNYXApIH07 CiAKLSAgICBKU0M6OkRlZmVyVGVybWluYXRpb24gZGVmZXJTY29wZSh2bSk7CisgICAgSlNDOjpE ZWZlclRlcm1pbmF0aW9uRm9yQVdoaWxlIGRlZmVyU2NvcGUodm0pOwogICAgIGF1dG8gc2NvcGUg PSBERUNMQVJFX0NBVENIX1NDT1BFKHZtKTsKIAogICAgIGJhY2tpbmdNYXAgPSBKU0M6OkpTTWFw OjpjcmVhdGUoJmxleGljYWxHbG9iYWxPYmplY3QsIHZtLCBsZXhpY2FsR2xvYmFsT2JqZWN0Lm1h cFN0cnVjdHVyZSgpKTsK