224920 2021-04-22 01:51:12 -0700 [JSC] Remove exception checks from non-throwing function calls in Baseline JIT 2021-05-19 15:13:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224952 224964 1 ysuzuki ysuzuki commit-queue ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1753081 0 ysuzuki 2021-04-22 01:51:12 -0700 [JSC} Remove exception checks from non-throwing function calls in Baseline JIT 1753082 1 426790 ysuzuki 2021-04-22 01:52:01 -0700 Created attachment 426790 Patch 1753152 2 426790 tzagallo 2021-04-22 07:14:20 -0700 Comment on attachment 426790 Patch r=me 1753218 3 426790 ysuzuki 2021-04-22 10:46:25 -0700 Comment on attachment 426790 Patch Thanks 1753236 4 ews-feeder 2021-04-22 11:42:40 -0700 Tools/Scripts/svn-apply failed to apply attachment 426790 to trunk. Please resolve the conflicts and upload a new patch. 1753270 5 ysuzuki 2021-04-22 13:17:29 -0700 Committed r276456 (236916@main): <https://commits.webkit.org/236916@main> 1753310 6 commit-queue 2021-04-22 15:06:30 -0700 Re-opened since this is blocked by bug 224952 1753313 7 ysuzuki 2021-04-22 15:08:02 -0700 Windows-specific crash is happening. 1753331 8 webkit-bug-importer 2021-04-22 15:57:01 -0700 <rdar://problem/77042600> 1761718 9 ysuzuki 2021-05-19 14:55:57 -0700 Now, Windows problem is fixed, let's land it. 1761725 10 ysuzuki 2021-05-19 15:13:28 -0700 Committed r277757 (237922@main): <https://commits.webkit.org/237922@main> 426790 2021-04-22 01:52:01 -0700 2021-04-22 13:09:43 -0700 Patch bug-224920-20210422015200.patch text/plain 10684 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw YjI5ZThhOWZmMTU0MTc1MDIxMTA0MGRkMThhYzI2MGRmYjk1OGY2Li43ZDEyZWM0ZWE0Mzk4ODQ1 MTAyNWYxODc3OWQ1ODAwYTg1MDY0YzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAyMS0wNC0yMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0N9IFJlbW92ZSBleGNlcHRpb24gY2hlY2tzIGZyb20gbm9uLXRocm93 aW5nIGZ1bmN0aW9uIGNhbGxzIGluIEJhc2VsaW5lIEpJVAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0OTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlc2UgZnVuY3Rpb25zIGFyZSBub3QgdGFraW5n IEpTR2xvYmFsT2JqZWN0IGFuZCB3aWxsIG5vdCB0aHJvdyBhbiBlcnJvci4KKyAgICAgICAgVXNl IGNhbGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrIGluc3RlYWQgdG8gYXZvaWQgZW1pdHRpbmcg dW5uZWNlc3NhcnkgZXhjZXB0aW9uIGNoZWNrcy4KKworICAgICAgICAqIGppdC9KSVQuY3BwOgor ICAgICAgICAoSlNDOjpKSVQ6OmVtaXRFbnRlck9wdGltaXphdGlvbkNoZWNrKToKKyAgICAgICAg KiBqaXQvSklUT3Bjb2Rlcy5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdFNsb3dfb3BfbmV3 X29iamVjdCk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9jYXRjaCk6CisgICAgICAgIChK U0M6OkpJVDo6ZW1pdF9vcF9zd2l0Y2hfaW1tKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0U2xv d19vcF9sb29wX2hpbnQpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfcHJvZmlsZV90eXBl KToKKyAgICAgICAgKiBqaXQvSklUT3Bjb2RlczMyXzY0LmNwcDoKKyAgICAgICAgKEpTQzo6SklU OjplbWl0U2xvd19vcF9uZXdfb2JqZWN0KToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX2Nh dGNoKToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0X29wX3N3aXRjaF9pbW0pOgorICAgICAgICAo SlNDOjpKSVQ6OmVtaXRfb3BfcHJvZmlsZV90eXBlKToKKyAgICAgICAgKiBqaXQvSklUUHJvcGVy dHlBY2Nlc3MuY3BwOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRXcml0ZUJhcnJpZXIpOgorCiAy MDIxLTA0LTIxICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAg W0pTQ10gREZHIC8gRlRMIHNob3VsZCBpbmxpbmUgc3dpdGNoX3N0cmluZwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVQuY3BwCmluZGV4IDY2YWQ4NGIwZDYyMGUxNjE0MDk4MDM2ZTJhNDJmZDRiYWUwODEz ZWEuLjg2MjgzMDQxNDZkZDI4NjM3NjQwN2EwOTYxNTcxZTIyYmY3NjZiMjcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVC5jcHAKQEAgLTk1LDcgKzk1LDcgQEAgdm9pZCBKSVQ6OmVtaXRFbnRlck9w dGltaXphdGlvbkNoZWNrKCkKIAogICAgIGNvcHlDYWxsZWVTYXZlc0Zyb21GcmFtZU9yUmVnaXN0 ZXJUb0VudHJ5RnJhbWVDYWxsZWVTYXZlc0J1ZmZlcih2bSgpLnRvcEVudHJ5RnJhbWUpOwogCi0g ICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25PcHRpbWl6ZSwgJnZtKCksIG1fYnl0ZWNvZGVJbmRl eC5hc0JpdHMoKSk7CisgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9u T3B0aW1pemUsICZ2bSgpLCBtX2J5dGVjb2RlSW5kZXguYXNCaXRzKCkpOwogICAgIHNraXBPcHRp bWl6ZS5hcHBlbmQoYnJhbmNoVGVzdFB0cihaZXJvLCByZXR1cm5WYWx1ZUdQUikpOwogICAgIGZh ckp1bXAocmV0dXJuVmFsdWVHUFIsIEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyKTsKICAgICBz a2lwT3B0aW1pemUubGluayh0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUT3Bjb2Rlcy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29k ZXMuY3BwCmluZGV4IDBkMzY5MTQ2NGRiZTU0YjZkYTk5MjZiZDQ5ZjRmZTRjMTUyNGJjYzcuLjk2 NmY0MTFhMDk4Y2U5MDY3ZWViYTViOWFhMTE3NjUyNDJlMDgxNGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcApAQCAtMTE1LDcgKzExNSw3IEBAIHZvaWQgSklUOjpl bWl0U2xvd19vcF9uZXdfb2JqZWN0KGNvbnN0IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rp b24sIFZlY3RvcjxTCiAgICAgYXV0byYgbWV0YWRhdGEgPSBieXRlY29kZS5tZXRhZGF0YShtX2Nv ZGVCbG9jayk7CiAgICAgVmlydHVhbFJlZ2lzdGVyIGRzdCA9IGJ5dGVjb2RlLm1fZHN0OwogICAg IFN0cnVjdHVyZSogc3RydWN0dXJlID0gbWV0YWRhdGEubV9vYmplY3RBbGxvY2F0aW9uUHJvZmls ZS5zdHJ1Y3R1cmUoKTsKLSAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbk5ld09iamVjdCwgVHJ1 c3RlZEltbVB0cigmdm0oKSksIHN0cnVjdHVyZSk7CisgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0 aW9uQ2hlY2sob3BlcmF0aW9uTmV3T2JqZWN0LCAmdm0oKSwgc3RydWN0dXJlKTsKICAgICBlbWl0 U3RvcmVDZWxsKGRzdCwgcmV0dXJuVmFsdWVHUFIpOwogfQogCkBAIC04NDIsNyArODQyLDcgQEAg dm9pZCBKSVQ6OmVtaXRfb3BfY2F0Y2goY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVj dGlvbikKIAogICAgIGFkZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9yKGNv ZGVCbG9jaygpKSAqIHNpemVvZihSZWdpc3RlcikpLCBjYWxsRnJhbWVSZWdpc3Rlciwgc3RhY2tQ b2ludGVyUmVnaXN0ZXIpOwogCi0gICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3Bl cmF0aW9uUmV0cmlldmVBbmRDbGVhckV4Y2VwdGlvbklmQ2F0Y2hhYmxlLCBUcnVzdGVkSW1tUHRy KCZ2bSgpKSk7CisgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uUmV0 cmlldmVBbmRDbGVhckV4Y2VwdGlvbklmQ2F0Y2hhYmxlLCAmdm0oKSk7CiAgICAgSnVtcCBpc0Nh dGNoYWJsZUV4Y2VwdGlvbiA9IGJyYW5jaFRlc3QzMihOb25aZXJvLCByZXR1cm5WYWx1ZUdQUik7 CiAgICAganVtcFRvRXhjZXB0aW9uSGFuZGxlcih2bSgpKTsKICAgICBpc0NhdGNoYWJsZUV4Y2Vw dGlvbi5saW5rKHRoaXMpOwpAQCAtODYxLDkgKzg2MSw5IEBAIHZvaWQgSklUOjplbWl0X29wX2Nh dGNoKGNvbnN0IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAgICAgYXV0byYgbWV0 YWRhdGEgPSBieXRlY29kZS5tZXRhZGF0YShtX2NvZGVCbG9jayk7CiAgICAgVmFsdWVQcm9maWxl QW5kVmlydHVhbFJlZ2lzdGVyQnVmZmVyKiBidWZmZXIgPSBtZXRhZGF0YS5tX2J1ZmZlcjsKICAg ICBpZiAoYnVmZmVyIHx8ICFzaG91bGRFbWl0UHJvZmlsaW5nKCkpCi0gICAgICAgIGNhbGxPcGVy YXRpb24ob3BlcmF0aW9uVHJ5T1NSRW50ZXJBdENhdGNoLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4 LmFzQml0cygpKTsKKyAgICAgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0 aW9uVHJ5T1NSRW50ZXJBdENhdGNoLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4LmFzQml0cygpKTsK ICAgICBlbHNlCi0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uVHJ5T1NSRW50ZXJBdENh dGNoQW5kVmFsdWVQcm9maWxlLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4LmFzQml0cygpKTsKKyAg ICAgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uVHJ5T1NSRW50ZXJB dENhdGNoQW5kVmFsdWVQcm9maWxlLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4LmFzQml0cygpKTsK ICAgICBhdXRvIHNraXBPU1JFbnRyeSA9IGJyYW5jaFRlc3RQdHIoWmVybywgcmV0dXJuVmFsdWVH UFIpOwogICAgIGVtaXRSZXN0b3JlQ2FsbGVlU2F2ZXMoKTsKICAgICBmYXJKdW1wKHJldHVyblZh bHVlR1BSLCBFeGNlcHRpb25IYW5kbGVyUHRyVGFnKTsKQEAgLTkwOCw3ICs5MDgsNyBAQCB2b2lk IEpJVDo6ZW1pdF9vcF9zd2l0Y2hfaW1tKGNvbnN0IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1 Y3Rpb24pCiAgICAgbGlua2VkVGFibGUuZW5zdXJlQ1RJVGFibGUodW5saW5rZWRUYWJsZSk7CiAK ICAgICBlbWl0R2V0VmlydHVhbFJlZ2lzdGVyKHNjcnV0aW5lZSwgcmVnVDApOwotICAgIGNhbGxP cGVyYXRpb24ob3BlcmF0aW9uU3dpdGNoSW1tV2l0aFVua25vd25LZXlUeXBlLCBUcnVzdGVkSW1t UHRyKCZ2bSgpKSwgcmVnVDAsIHRhYmxlSW5kZXgsIHVubGlua2VkVGFibGUubV9taW4pOworICAg IGNhbGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrKG9wZXJhdGlvblN3aXRjaEltbVdpdGhVbmtu b3duS2V5VHlwZSwgJnZtKCksIHJlZ1QwLCB0YWJsZUluZGV4LCB1bmxpbmtlZFRhYmxlLm1fbWlu KTsKICAgICBmYXJKdW1wKHJldHVyblZhbHVlR1BSLCBKU1N3aXRjaFB0clRhZyk7CiB9CiAKQEAg LTEyMDQsNyArMTIwNCw3IEBAIHZvaWQgSklUOjplbWl0U2xvd19vcF9sb29wX2hpbnQoY29uc3Qg SW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbiwgVmVjdG9yPFNsCiAKICAgICAgICAgY29w eUNhbGxlZVNhdmVzRnJvbUZyYW1lT3JSZWdpc3RlclRvRW50cnlGcmFtZUNhbGxlZVNhdmVzQnVm ZmVyKHZtKCkudG9wRW50cnlGcmFtZSk7CiAKLSAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRp b25PcHRpbWl6ZSwgJnZtKCksIG1fYnl0ZWNvZGVJbmRleC5hc0JpdHMoKSk7CisgICAgICAgIGNh bGxPcGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrKG9wZXJhdGlvbk9wdGltaXplLCAmdm0oKSwgbV9i eXRlY29kZUluZGV4LmFzQml0cygpKTsKICAgICAgICAgSnVtcCBub09wdGltaXplZEVudHJ5ID0g YnJhbmNoVGVzdFB0cihaZXJvLCByZXR1cm5WYWx1ZUdQUik7CiAgICAgICAgIGlmIChBU1NFUlRf RU5BQkxFRCkgewogICAgICAgICAgICAgSnVtcCBvayA9IGJyYW5jaFB0cihNYWNyb0Fzc2VtYmxl cjo6QWJvdmUsIHJldHVyblZhbHVlR1BSLCBUcnVzdGVkSW1tUHRyKGJpdHdpc2VfY2FzdDx2b2lk Kj4oc3RhdGljX2Nhc3Q8aW50cHRyX3Q+KDEwMDApKSkpOwpAQCAtMTY1Nyw3ICsxNjU3LDcgQEAg dm9pZCBKSVQ6OmVtaXRfb3BfcHJvZmlsZV90eXBlKGNvbnN0IEluc3RydWN0aW9uKiBjdXJyZW50 SW5zdHJ1Y3Rpb24pCiAgICAgc3RvcmU2NChyZWdUMSwgQWRkcmVzcyhyZWdUMiwgVHlwZVByb2Zp bGVyTG9nOjpjdXJyZW50TG9nRW50cnlPZmZzZXQoKSkpOwogICAgIEp1bXAgc2tpcENsZWFyTG9n ID0gYnJhbmNoUHRyKE5vdEVxdWFsLCByZWdUMSwgVHJ1c3RlZEltbVB0cihjYWNoZWRUeXBlUHJv ZmlsZXJMb2ctPmxvZ0VuZFB0cigpKSk7CiAgICAgLy8gQ2xlYXIgdGhlIGxvZyBpZiB3ZSdyZSBh dCB0aGUgZW5kIG9mIHRoZSBsb2cuCi0gICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25Qcm9jZXNz VHlwZVByb2ZpbGVyTG9nLCAmdm0oKSk7CisgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hl Y2sob3BlcmF0aW9uUHJvY2Vzc1R5cGVQcm9maWxlckxvZywgJnZtKCkpOwogICAgIHNraXBDbGVh ckxvZy5saW5rKHRoaXMpOwogCiAgICAganVtcFRvRW5kLmxpbmsodGhpcyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAKaW5kZXggMmY1ZTk2YWUzZWQ3 MTBjMDAyYTU2NTZiMTdjZjdlNWIzYWJmZDhkOS4uZTRkOGNlZTA3ODg0NWI4ODE3NzM0MGE2ODdm MmIxNDY2ZTk2YTk2NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRP cGNvZGVzMzJfNjQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rl czMyXzY0LmNwcApAQCAtMTEzLDcgKzExMyw3IEBAIHZvaWQgSklUOjplbWl0U2xvd19vcF9uZXdf b2JqZWN0KGNvbnN0IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24sIFZlY3RvcjxTCiAg ICAgYXV0byYgbWV0YWRhdGEgPSBieXRlY29kZS5tZXRhZGF0YShtX2NvZGVCbG9jayk7CiAgICAg VmlydHVhbFJlZ2lzdGVyIGRzdCA9IGJ5dGVjb2RlLm1fZHN0OwogICAgIFN0cnVjdHVyZSogc3Ry dWN0dXJlID0gbWV0YWRhdGEubV9vYmplY3RBbGxvY2F0aW9uUHJvZmlsZS5zdHJ1Y3R1cmUoKTsK LSAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvbk5ld09iamVjdCwgVHJ1c3RlZEltbVB0cigmdm0o KSksIHN0cnVjdHVyZSk7CisgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0 aW9uTmV3T2JqZWN0LCAmdm0oKSwgc3RydWN0dXJlKTsKICAgICBlbWl0U3RvcmVDZWxsKGRzdCwg cmV0dXJuVmFsdWVHUFIpOwogfQogCkBAIC05MzEsNyArOTMxLDcgQEAgdm9pZCBKSVQ6OmVtaXRf b3BfY2F0Y2goY29uc3QgSW5zdHJ1Y3Rpb24qIGN1cnJlbnRJbnN0cnVjdGlvbikKIAogICAgIGFk ZFB0cihUcnVzdGVkSW1tMzIoc3RhY2tQb2ludGVyT2Zmc2V0Rm9yKGNvZGVCbG9jaygpKSAqIHNp emVvZihSZWdpc3RlcikpLCBjYWxsRnJhbWVSZWdpc3Rlciwgc3RhY2tQb2ludGVyUmVnaXN0ZXIp OwogCi0gICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uUmV0cmlldmVB bmRDbGVhckV4Y2VwdGlvbklmQ2F0Y2hhYmxlLCBUcnVzdGVkSW1tUHRyKCZ2bSgpKSk7CisgICAg Y2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uUmV0cmlldmVBbmRDbGVhckV4 Y2VwdGlvbklmQ2F0Y2hhYmxlLCAmdm0oKSk7CiAgICAgSnVtcCBpc0NhdGNoYWJsZUV4Y2VwdGlv biA9IGJyYW5jaFRlc3QzMihOb25aZXJvLCByZXR1cm5WYWx1ZUdQUik7CiAgICAganVtcFRvRXhj ZXB0aW9uSGFuZGxlcih2bSgpKTsKICAgICBpc0NhdGNoYWJsZUV4Y2VwdGlvbi5saW5rKHRoaXMp OwpAQCAtOTU1LDkgKzk1NSw5IEBAIHZvaWQgSklUOjplbWl0X29wX2NhdGNoKGNvbnN0IEluc3Ry dWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAgICAgYXV0byYgbWV0YWRhdGEgPSBieXRlY29k ZS5tZXRhZGF0YShtX2NvZGVCbG9jayk7CiAgICAgVmFsdWVQcm9maWxlQW5kVmlydHVhbFJlZ2lz dGVyQnVmZmVyKiBidWZmZXIgPSBtZXRhZGF0YS5tX2J1ZmZlcjsKICAgICBpZiAoYnVmZmVyIHx8 ICFzaG91bGRFbWl0UHJvZmlsaW5nKCkpCi0gICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9u VHJ5T1NSRW50ZXJBdENhdGNoLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4LmFzQml0cygpKTsKKyAg ICAgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uVHJ5T1NSRW50ZXJB dENhdGNoLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4LmFzQml0cygpKTsKICAgICBlbHNlCi0gICAg ICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uVHJ5T1NSRW50ZXJBdENhdGNoQW5kVmFsdWVQcm9m aWxlLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4LmFzQml0cygpKTsKKyAgICAgICAgY2FsbE9wZXJh dGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uVHJ5T1NSRW50ZXJBdENhdGNoQW5kVmFsdWVQ cm9maWxlLCAmdm0oKSwgbV9ieXRlY29kZUluZGV4LmFzQml0cygpKTsKICAgICBhdXRvIHNraXBP U1JFbnRyeSA9IGJyYW5jaFRlc3RQdHIoWmVybywgcmV0dXJuVmFsdWVHUFIpOwogICAgIGVtaXRS ZXN0b3JlQ2FsbGVlU2F2ZXMoKTsKICAgICBmYXJKdW1wKHJldHVyblZhbHVlR1BSLCBOb1B0clRh Zyk7CkBAIC0xMDAwLDcgKzEwMDAsNyBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9zd2l0Y2hfaW1tKGNv bnN0IEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAgICAgbGlua2VkVGFibGUuZW5z dXJlQ1RJVGFibGUodW5saW5rZWRUYWJsZSk7CiAKICAgICBlbWl0TG9hZChzY3J1dGluZWUsIHJl Z1QxLCByZWdUMCk7Ci0gICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25Td2l0Y2hJbW1XaXRoVW5r bm93bktleVR5cGUsIFRydXN0ZWRJbW1QdHIoJnZtKCkpLCBKU1ZhbHVlUmVncyhyZWdUMSwgcmVn VDApLCB0YWJsZUluZGV4LCB1bmxpbmtlZFRhYmxlLm1fbWluKTsKKyAgICBjYWxsT3BlcmF0aW9u Tm9FeGNlcHRpb25DaGVjayhvcGVyYXRpb25Td2l0Y2hJbW1XaXRoVW5rbm93bktleVR5cGUsICZ2 bSgpLCBKU1ZhbHVlUmVncyhyZWdUMSwgcmVnVDApLCB0YWJsZUluZGV4LCB1bmxpbmtlZFRhYmxl Lm1fbWluKTsKICAgICBmYXJKdW1wKHJldHVyblZhbHVlR1BSLCBOb1B0clRhZyk7CiB9CiAKQEAg LTE0MTQsNyArMTQxNCw3IEBAIHZvaWQgSklUOjplbWl0X29wX3Byb2ZpbGVfdHlwZShjb25zdCBJ bnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogICAgIHN0b3JlMzIocmVnVDEsIEFkZHJl c3MocmVnVDIsIFR5cGVQcm9maWxlckxvZzo6Y3VycmVudExvZ0VudHJ5T2Zmc2V0KCkpKTsKICAg ICBqdW1wVG9FbmQuYXBwZW5kKGJyYW5jaFB0cihOb3RFcXVhbCwgcmVnVDEsIFRydXN0ZWRJbW1Q dHIoY2FjaGVkVHlwZVByb2ZpbGVyTG9nLT5sb2dFbmRQdHIoKSkpKTsKICAgICAvLyBDbGVhciB0 aGUgbG9nIGlmIHdlJ3JlIGF0IHRoZSBlbmQgb2YgdGhlIGxvZy4KLSAgICBjYWxsT3BlcmF0aW9u KG9wZXJhdGlvblByb2Nlc3NUeXBlUHJvZmlsZXJMb2csICZ2bSgpKTsKKyAgICBjYWxsT3BlcmF0 aW9uTm9FeGNlcHRpb25DaGVjayhvcGVyYXRpb25Qcm9jZXNzVHlwZVByb2ZpbGVyTG9nLCAmdm0o KSk7CiAKICAgICBqdW1wVG9FbmQubGluayh0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAKaW5kZXggNTJhZjMxMWQ2OGVjYjgzZDE3 MTQzMzg4MDc3OWUyNTBiZTNkZWI1OC4uZDVhMDcwODAwNjFiOThiMzBmN2Q2NGM5YmI5ZGExZDBi MjVmMDM5YiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0 eUFjY2Vzcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFj Y2Vzcy5jcHAKQEAgLTEzNzEsNyArMTM3MSw3IEBAIHZvaWQgSklUOjplbWl0V3JpdGVCYXJyaWVy KFZpcnR1YWxSZWdpc3RlciBvd25lciwgVmlydHVhbFJlZ2lzdGVyIHZhbHVlLCBXcml0ZUJhCiAg ICAgICAgIG93bmVyTm90Q2VsbCA9IGJyYW5jaElmTm90Q2VsbChyZWdUMCk7CiAKICAgICBKdW1w IG93bmVySXNSZW1lbWJlcmVkT3JJbkVkZW4gPSBiYXJyaWVyQnJhbmNoKHZtKCksIHJlZ1QwLCBy ZWdUMSk7Ci0gICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25Xcml0ZUJhcnJpZXJTbG93UGF0aCwg JnZtKCksIHJlZ1QwKTsKKyAgICBjYWxsT3BlcmF0aW9uTm9FeGNlcHRpb25DaGVjayhvcGVyYXRp b25Xcml0ZUJhcnJpZXJTbG93UGF0aCwgJnZtKCksIHJlZ1QwKTsKICAgICBvd25lcklzUmVtZW1i ZXJlZE9ySW5FZGVuLmxpbmsodGhpcyk7CiAKICAgICBpZiAobW9kZSA9PSBTaG91bGRGaWx0ZXJC YXNlQW5kVmFsdWUgfHwgbW9kZSA9PSBTaG91bGRGaWx0ZXJCYXNlKQpAQCAtMTQ0MCw3ICsxNDQw LDcgQEAgdm9pZCBKSVQ6OmVtaXRXcml0ZUJhcnJpZXIoVmlydHVhbFJlZ2lzdGVyIG93bmVyLCBW aXJ0dWFsUmVnaXN0ZXIgdmFsdWUsIFdyaXRlQmEKICAgICAgICAgb3duZXJOb3RDZWxsID0gYnJh bmNoSWZOb3RDZWxsKHJlZ1QwKTsKIAogICAgIEp1bXAgb3duZXJJc1JlbWVtYmVyZWRPckluRWRl biA9IGJhcnJpZXJCcmFuY2godm0oKSwgcmVnVDEsIHJlZ1QyKTsKLSAgICBjYWxsT3BlcmF0aW9u KG9wZXJhdGlvbldyaXRlQmFycmllclNsb3dQYXRoLCAmdm0oKSwgcmVnVDEpOworICAgIGNhbGxP cGVyYXRpb25Ob0V4Y2VwdGlvbkNoZWNrKG9wZXJhdGlvbldyaXRlQmFycmllclNsb3dQYXRoLCAm dm0oKSwgcmVnVDEpOwogICAgIG93bmVySXNSZW1lbWJlcmVkT3JJbkVkZW4ubGluayh0aGlzKTsK IAogICAgIGlmIChtb2RlID09IFNob3VsZEZpbHRlckJhc2UgfHwgbW9kZSA9PSBTaG91bGRGaWx0 ZXJCYXNlQW5kVmFsdWUpCkBAIC0xNTIyLDcgKzE1MjIsNyBAQCB2b2lkIEpJVDo6ZW1pdFdyaXRl QmFycmllcihWaXJ0dWFsUmVnaXN0ZXIgb3duZXIsIFdyaXRlQmFycmllck1vZGUgbW9kZSkKIHZv aWQgSklUOjplbWl0V3JpdGVCYXJyaWVyKEpTQ2VsbCogb3duZXIpCiB7CiAgICAgSnVtcCBvd25l cklzUmVtZW1iZXJlZE9ySW5FZGVuID0gYmFycmllckJyYW5jaCh2bSgpLCBvd25lciwgcmVnVDAp OwotICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0aW9uV3JpdGVCYXJyaWVyU2xvd1BhdGgsICZ2bSgp LCBvd25lcik7CisgICAgY2FsbE9wZXJhdGlvbk5vRXhjZXB0aW9uQ2hlY2sob3BlcmF0aW9uV3Jp dGVCYXJyaWVyU2xvd1BhdGgsICZ2bSgpLCBvd25lcik7CiAgICAgb3duZXJJc1JlbWVtYmVyZWRP ckluRWRlbi5saW5rKHRoaXMpOwogfQogCg==