220339 2021-01-05 14:19:13 -0800 [JSC] DFG/FTL DirectCall need to respect Wasm IC 2021-01-27 11:18:38 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 221051 1 ysuzuki ysuzuki commit-queue ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1717473 0 ysuzuki 2021-01-05 14:19:13 -0800 ... 1717528 1 417047 ysuzuki 2021-01-05 16:14:25 -0800 Created attachment 417047 Patch 1717566 2 ysuzuki 2021-01-05 17:59:25 -0800 SamplingProfiler tests' rebaseline were necessary (because of how Wasm IC is called is changed in several places). Done. 1717567 3 ysuzuki 2021-01-05 18:01:29 -0800 ** The following JSC stress test failures have been introduced: stress/sampling-profiler-wasm-name-section.js.default stress/sampling-profiler-wasm.js.default wasm.yaml/wasm/function-tests/nameSection.js.default-wasm wasm.yaml/wasm/function-tests/nameSection.js.wasm-air wasm.yaml/wasm/function-tests/nameSection.js.wasm-b3 wasm.yaml/wasm/function-tests/nameSection.js.wasm-collect-continuously wasm.yaml/wasm/function-tests/nameSection.js.wasm-eager wasm.yaml/wasm/function-tests/nameSection.js.wasm-eager-jettison wasm.yaml/wasm/function-tests/nameSection.js.wasm-no-cjit-yes-tls-context wasm.yaml/wasm/function-tests/nameSection.js.wasm-no-tls-context wasm.yaml/wasm/function-tests/nameSection.js.wasm-slow-memory Ensured they are working by adjusting test side (since sampling profiler stack is changed). 1717568 4 ysuzuki 2021-01-05 19:04:14 -0800 Committed r271186: <https://trac.webkit.org/changeset/271186> 1717571 5 webkit-bug-importer 2021-01-05 19:05:32 -0800 <rdar://problem/72838323> 1723073 6 commit-queue 2021-01-27 11:18:38 -0800 Re-opened since this is blocked by bug 221051 417047 2021-01-05 16:14:25 -0800 2021-01-05 16:22:31 -0800 Patch bug-220339-20210105161424.patch text/plain 9982 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw Y2EwMGYwMTE4OTJkYjljZDcwMGIwY2E4MzM1NTM3NzA2OTg0MTUyLi44YTUwMjk4OTlkMGU3NGMx ODBkYzgyZmMyNTE3NTdhMDMyMTRhNjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MiBAQAorMjAyMS0wMS0wNSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIERGRy9GVEwgRGlyZWN0Q2FsbCBuZWVkIHRvIHJlc3BlY3QgV2Fz bSBJQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIw MzM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ug Zm91bmQgdGhhdCBXYXNtIElDIGZvciBmYXN0IGNhbGxzIGFyZSBub3QgdXNlZCBpbiBzZXZlcmFs IHBsYWNlcy4KKworICAgICAgICAgICAgMS4gTExJbnQgY2FsbHMKKyAgICAgICAgICAgIDIuIERG Ry9GVEwgRGlyZWN0Q2FsbAorICAgICAgICAgICAgMy4gVmlydHVhbCBjYWxscworCisgICAgICAg IFdlIG5vdGljZWQgdGhpcyBiZWNhdXNlIG9mIHIyNzExMTIuIHIyNzExMTIgbWFkZSB3YXNtIGZ1 bmN0aW9uIGxvYWRpbmcgZnJvbSBleHBvcnRzIGNvbnN0YW50LWZvbGRlZCBpbiBERkcvRlRMLgor ICAgICAgICBBbmQgaXQgZW1pdHMgRGlyZWN0Q2FsbCBpbnN0ZWFkIG9mIENhbGwgaW4gREZHL0ZU TC4gVGhlbiwgd2UgbWlzc2VkIFdhc20gSUMgYW5kIGdldCBsYXJnZSBwZXJmb3JtYW5jZSByZWdy ZXNzaW9uCisgICAgICAgIGluIEpldFN0cmVhbTIgcmljaGFyZC13YXNtLgorCisgICAgICAgIElu IHRoaXMgcGF0Y2gsIHdlIHVzZSBXYXNtIElDIGFzIG11Y2ggYXMgcG9zc2libGUuIFRoZSBrZXkg dGhpbmcgb2YgdGhpcyB3YXNtIElDIGlzIHRoYXQgaXQgcmVsaWVzIG9uIGNhbGxlZS4KKyAgICAg ICAgU28sIGlmIHRoZSBwbGFjZSBpcyBqdXN0IGNoZWNraW5nIEV4ZWN1dGFibGUsIHRoZW4gd2Ug c2hvdWxkIG5vdCBnbyB0byB0aGF0IElDLiBGb3J0dW5hdGVseSwgdGhlIGFib3ZlIHRocmVlIGNo ZWNrcworICAgICAgICBjYWxsZWUgYmVmb3JlIHVzaW5nIGNvZGUgcG9pbnRlciBvYnRhaW5lZCBm b3IgV2FzbSBJQy4KKworICAgICAgICAgICAgMS4gTExJbnQgY2FsbCBmYXN0IHBhdGggZmlyc3Qg Y2hlY2tzIGNhbGxlZS4KKyAgICAgICAgICAgIDIuIERGRy9GVEwgRGlyZWN0Q2FsbCByZXF1aXJl cyBjYWxsZWUgaXMgY29uc3RhbnQgZm9yIHdhc20gZnVuY3Rpb25zLgorICAgICAgICAgICAgMy4g VmlydHVhbCBjYWxscyBhcmUgbm90IHN0b3JpbmcgZ2VuZXJhdGVkIGNvZGVQdHIuCisKKyAgICAg ICAgKiBkZmcvREZHT3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6SlNDX0RFRklO RV9KSVRfT1BFUkFUSU9OKToKKyAgICAgICAgKiBkZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFz ZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3RyZW5ndGhSZWR1Y3Rpb25QaGFzZTo6aGFuZGxl Tm9kZSk6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuY3BwOgorICAgICAgICAoSlNDOjp2 aXJ0dWFsRm9yV2l0aEZ1bmN0aW9uKToKKyAgICAgICAgKiBsbGludC9MTEludFNsb3dQYXRocy5j cHA6CisgICAgICAgIChKU0M6OkxMSW50OjpzZXRVcENhbGwpOgorICAgICAgICAqIHJ1bnRpbWUv SW50cmluc2ljLmNwcDoKKyAgICAgICAgKEpTQzo6aW50cmluc2ljTmFtZSk6CisgICAgICAgICog cnVudGltZS9JbnRyaW5zaWMuaDoKKyAgICAgICAgKiB3YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rp b24uY3BwOgorICAgICAgICAoSlNDOjpXZWJBc3NlbWJseUZ1bmN0aW9uOjpjcmVhdGUpOgorCiAy MDIxLTAxLTA1ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAg W1dBU01dIFtCaWdJbnRdIEFkZCBJNjQgdG8gQmlnSW50IGNvbnZlcnNpb24KZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCmluZGV4IDRkMmMxOWQzYmRlZWQ5ZjA4 MmNjZjU3NGJmZGU3ZmZhNjZiZDNkYTIuLjI1ZWYzMzA1YjE3YmNhMDdlNmZiMzI4YzdmOGZkNDc5 ZDRkY2EzYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0 aW9ucy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNw cApAQCAtMzU1MCw5ICszNTUwLDEzIEBAIEpTQ19ERUZJTkVfSklUX09QRVJBVElPTihvcGVyYXRp b25MaW5rRGlyZWN0Q2FsbCwgdm9pZCwgKENhbGxMaW5rSW5mbyogY2FsbExpbmtJCiAKICAgICBN YWNyb0Fzc2VtYmxlckNvZGVQdHI8SlNFbnRyeVB0clRhZz4gY29kZVB0cjsKICAgICBDb2RlQmxv Y2sqIGNvZGVCbG9jayA9IG51bGxwdHI7Ci0gICAgaWYgKGV4ZWN1dGFibGUtPmlzSG9zdEZ1bmN0 aW9uKCkpCi0gICAgICAgIGNvZGVQdHIgPSBleGVjdXRhYmxlLT5lbnRyeXBvaW50Rm9yKGtpbmQs IE11c3RDaGVja0FyaXR5KTsKLSAgICBlbHNlIHsKKyAgICBpZiAoZXhlY3V0YWJsZS0+aXNIb3N0 RnVuY3Rpb24oKSkgeworICAgICAgICAvLyBqc1RvV2FzbUlDQ29kZVB0ciBhc3N1bWVzIHRoYXQg Y2FsbGVlIGlzIGFsd2F5cyB0aGUgc2FtZSBzaW5jZSBEaXJlY3RDYWxsIGRvZXMgbm90IGNoZWNr IGNhbGxlZS4KKyAgICAgICAgLy8gQnV0IGZvciB3YXNtIGZ1bmN0aW9ucywgd2UgYWxyZWFkeSBl bnN1cmVkIHRoYXQgY2FsbGVlIGlzIGNvbnN0YW50IHdoZW4gZW1pdHRpbmcgRGlyZWN0Q2FsbC4K KyAgICAgICAgY29kZVB0ciA9IGpzVG9XYXNtSUNDb2RlUHRyKHZtLCBraW5kLCBjYWxsZWUpOwor ICAgICAgICBpZiAoIWNvZGVQdHIpCisgICAgICAgICAgICBjb2RlUHRyID0gZXhlY3V0YWJsZS0+ ZW50cnlwb2ludEZvcihraW5kLCBNdXN0Q2hlY2tBcml0eSk7CisgICAgfSBlbHNlIHsKICAgICAg ICAgRnVuY3Rpb25FeGVjdXRhYmxlKiBmdW5jdGlvbkV4ZWN1dGFibGUgPSBzdGF0aWNfY2FzdDxG dW5jdGlvbkV4ZWN1dGFibGUqPihleGVjdXRhYmxlKTsKIAogICAgICAgICBSRUxFQVNFX0FTU0VS VChpc0NhbGwoa2luZCkgfHwgZnVuY3Rpb25FeGVjdXRhYmxlLT5jb25zdHJ1Y3RBYmlsaXR5KCkg IT0gQ29uc3RydWN0QWJpbGl0eTo6Q2Fubm90Q29uc3RydWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFzZS5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0cmVuZ3RoUmVkdWN0aW9uUGhhc2UuY3BwCmluZGV4 IDBjNDQzY2JjOTlmYTVhOTBjZGJiMWNiMzE1YjFiMzc1NDg3MDRhZjguLjc1YTNmNGE3NzZkYWU2 NDMxZTg2NWZjMzg3MjkwMGYwNmRlMmJjM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTdHJlbmd0aFJlZHVjdGlvblBoYXNlLmNwcApAQCAtOTE3LDcgKzkx Nyw4IEBAIGNsYXNzIFN0cmVuZ3RoUmVkdWN0aW9uUGhhc2UgOiBwdWJsaWMgUGhhc2UgewogICAg ICAgICAgICAgRXhlY3V0YWJsZUJhc2UqIGV4ZWN1dGFibGUgPSBudWxscHRyOwogICAgICAgICAg ICAgRWRnZSBjYWxsZWUgPSBtX2dyYXBoLnZhckFyZ0NoaWxkKG1fbm9kZSwgMCk7CiAgICAgICAg ICAgICBDYWxsVmFyaWFudCBjYWxsVmFyaWFudDsKLSAgICAgICAgICAgIGlmIChKU0Z1bmN0aW9u KiBmdW5jdGlvbiA9IGNhbGxlZS0+ZHluYW1pY0Nhc3RDb25zdGFudDxKU0Z1bmN0aW9uKj4odm0o KSkpIHsKKyAgICAgICAgICAgIEpTRnVuY3Rpb24qIGZ1bmN0aW9uID0gY2FsbGVlLT5keW5hbWlj Q2FzdENvbnN0YW50PEpTRnVuY3Rpb24qPih2bSgpKTsKKyAgICAgICAgICAgIGlmIChmdW5jdGlv bikgewogICAgICAgICAgICAgICAgIGV4ZWN1dGFibGUgPSBmdW5jdGlvbi0+ZXhlY3V0YWJsZSgp OwogICAgICAgICAgICAgICAgIGNhbGxWYXJpYW50ID0gQ2FsbFZhcmlhbnQoZnVuY3Rpb24pOwog ICAgICAgICAgICAgfSBlbHNlIGlmIChjYWxsZWUtPmlzRnVuY3Rpb25BbGxvY2F0aW9uKCkpIHsK QEAgLTkyNyw2ICs5MjgsMTUgQEAgY2xhc3MgU3RyZW5ndGhSZWR1Y3Rpb25QaGFzZSA6IHB1Ymxp YyBQaGFzZSB7CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGlmICghZXhlY3V0YWJsZSkKICAg ICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgLy8gSWYgdGhpcyBpcyB3YXNtIGZ1 bmN0aW9uLCBhbmQgY2FsbGVlIGlzIG5vdCBhbiBjb25zdGFudCwKKyAgICAgICAgICAgIC8vIHdl IHNob3VsZCBub3QgdXNlIERpcmVjdENhbGwgc2luY2UgaXQgd2lsbCBlbWl0IFdhc20gSUMgYmFz ZWQgb24gdGhlIGFzc3VtcHRpb24gdGhhdCB0aGUgY2FsbGVlIGlzIGNvbnN0YW50LgorICAgICAg ICAgICAgLy8gQ3VycmVudGx5LCB0aGVyZSBpcyBubyB3YXkgdG8gcmVhY2ggdG8gdGhpcyBjb25k aXRpb24gKHNpbmNlIG5vIGZ1bmN0aW9uLWFsbG9jYXRpb24gbm9kZSBnZW5lcmF0ZXMgV2ViQXNz ZW1ibHlGdW5jdGlvbiksCisgICAgICAgICAgICAvLyBidXQgdGhpcyBpcyBnb29kIGd1YXJkIGZv ciB0aGUgZnV0dXJlIGV4dGVuc2lvbi4KKyAgICAgICAgICAgIGlmIChleGVjdXRhYmxlLT5pbnRy aW5zaWMoKSA9PSBXYXNtRnVuY3Rpb25JbnRyaW5zaWMpIHsKKyAgICAgICAgICAgICAgICBpZiAo IWZ1bmN0aW9uKQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KICAg ICAgICAgICAgIAogICAgICAgICAgICAgaWYgKEZ1bmN0aW9uRXhlY3V0YWJsZSogZnVuY3Rpb25F eGVjdXRhYmxlID0ganNEeW5hbWljQ2FzdDxGdW5jdGlvbkV4ZWN1dGFibGUqPih2bSgpLCBleGVj dXRhYmxlKSkgewogICAgICAgICAgICAgICAgIGlmIChtX25vZGUtPm9wKCkgPT0gQ29uc3RydWN0 ICYmIGZ1bmN0aW9uRXhlY3V0YWJsZS0+Y29uc3RydWN0QWJpbGl0eSgpID09IENvbnN0cnVjdEFi aWxpdHk6OkNhbm5vdENvbnN0cnVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9w ZXJhdGlvbnMuY3BwCmluZGV4IDJiOTZjOTNjMzExMGQxZDI4YjcxNzI0MTFhZGU5NDg1YWQyZmJh OTcuLmYwNWRlNzg1YTRhNWEzMmJiMDVlM2EwMDZkZmQzZDE4YzA1ZWQ0OTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcApAQCAtMTM4OSw4ICsxMzg5LDE0 IEBAIGlubGluZSBTbG93UGF0aFJldHVyblR5cGUgdmlydHVhbEZvcldpdGhGdW5jdGlvbihKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDCiAgICAgICAgICAgICAgICAgcmVpbnRlcnByZXRf Y2FzdDx2b2lkKj4oS2VlcFRoZUZyYW1lKSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJu IGVuY29kZVJlc3VsdChleGVjdXRhYmxlLT5lbnRyeXBvaW50Rm9yKAotICAgICAgICBraW5kLCBN dXN0Q2hlY2tBcml0eSkuZXhlY3V0YWJsZUFkZHJlc3MoKSwKKworICAgIE1hY3JvQXNzZW1ibGVy Q29kZVB0cjxKU0VudHJ5UHRyVGFnPiBjb2RlUHRyOworICAgIGlmIChleGVjdXRhYmxlLT5pc0hv c3RGdW5jdGlvbigpKQorICAgICAgICBjb2RlUHRyID0ganNUb1dhc21JQ0NvZGVQdHIodm0sIGtp bmQsIGZ1bmN0aW9uKTsKKyAgICBpZiAoIWNvZGVQdHIpCisgICAgICAgIGNvZGVQdHIgPSBleGVj dXRhYmxlLT5lbnRyeXBvaW50Rm9yKGtpbmQsIE11c3RDaGVja0FyaXR5KTsKKworICAgIHJldHVy biBlbmNvZGVSZXN1bHQoY29kZVB0ci5leGVjdXRhYmxlQWRkcmVzcygpLAogICAgICAgICByZWlu dGVycHJldF9jYXN0PHZvaWQqPihjYWxsTGlua0luZm8tPmNhbGxNb2RlKCkgPT0gQ2FsbE1vZGU6 OlRhaWwgPyBSZXVzZVRoZUZyYW1lIDogS2VlcFRoZUZyYW1lKSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCmluZGV4IDUzNWQzYzlmODA5 MjU3NmViNjhiY2QyZGRjYzBlZDU0NjNkODQ0NGIuLjZjZWIxYzY3N2JkNTI1ZDRlMDgyMzMyMWI1 ZmNjZTJmMmMyYTE4MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9M TEludFNsb3dQYXRocy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50 U2xvd1BhdGhzLmNwcApAQCAtNjAsNiArNjAsNyBAQAogI2luY2x1ZGUgIk9iamVjdFByb3BlcnR5 Q29uZGl0aW9uU2V0LmgiCiAjaW5jbHVkZSAiUHJvdG9DYWxsRnJhbWVJbmxpbmVzLmgiCiAjaW5j bHVkZSAiUmVnRXhwT2JqZWN0LmgiCisjaW5jbHVkZSAiUmVwYXRjaC5oIgogI2luY2x1ZGUgIlNo YWRvd0NoaWNrZW4uaCIKICNpbmNsdWRlICJTdXBlclNhbXBsZXIuaCIKICNpbmNsdWRlICJWTUlu bGluZXMuaCIKQEAgLTE3MzYsOSArMTczNywxMyBAQCBpbmxpbmUgU2xvd1BhdGhSZXR1cm5UeXBl IHNldFVwQ2FsbChDYWxsRnJhbWUqIGNhbGxlZUZyYW1lLCBDb2RlU3BlY2lhbGl6YXRpb25LaQog CiAgICAgTWFjcm9Bc3NlbWJsZXJDb2RlUHRyPEpTRW50cnlQdHJUYWc+IGNvZGVQdHI7CiAgICAg Q29kZUJsb2NrKiBjb2RlQmxvY2sgPSBudWxscHRyOwotICAgIGlmIChleGVjdXRhYmxlLT5pc0hv c3RGdW5jdGlvbigpKQotICAgICAgICBjb2RlUHRyID0gZXhlY3V0YWJsZS0+ZW50cnlwb2ludEZv cihraW5kLCBNdXN0Q2hlY2tBcml0eSk7Ci0gICAgZWxzZSB7CisgICAgaWYgKGV4ZWN1dGFibGUt PmlzSG9zdEZ1bmN0aW9uKCkpIHsKKyNpZiBFTkFCTEUoSklUKQorICAgICAgICBjb2RlUHRyID0g anNUb1dhc21JQ0NvZGVQdHIodm0sIGtpbmQsIGNhbGxlZSk7CisjZW5kaWYKKyAgICAgICAgaWYg KCFjb2RlUHRyKQorICAgICAgICAgICAgY29kZVB0ciA9IGV4ZWN1dGFibGUtPmVudHJ5cG9pbnRG b3Ioa2luZCwgTXVzdENoZWNrQXJpdHkpOworICAgIH0gZWxzZSB7CiAgICAgICAgIEZ1bmN0aW9u RXhlY3V0YWJsZSogZnVuY3Rpb25FeGVjdXRhYmxlID0gc3RhdGljX2Nhc3Q8RnVuY3Rpb25FeGVj dXRhYmxlKj4oZXhlY3V0YWJsZSk7CiAKICAgICAgICAgaWYgKCFpc0NhbGwoa2luZCkgJiYgZnVu Y3Rpb25FeGVjdXRhYmxlLT5jb25zdHJ1Y3RBYmlsaXR5KCkgPT0gQ29uc3RydWN0QWJpbGl0eTo6 Q2Fubm90Q29uc3RydWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSW50cmluc2ljLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludHJpbnNp Yy5jcHAKaW5kZXggMjcyNTNlMzQ5ZWIwZDIyZjBhZmIyZjMwMzY3MTAxYzQ0ZjhiNDBkMS4uMTQ0 YmEzY2M2YTY3ZmRiNjBiYzQ4MDFkZTNiYTdiYjJmZDA2NjQyOSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50cmluc2ljLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9JbnRyaW5zaWMuY3BwCkBAIC0zMzcsNiArMzM3LDggQEAgY29uc3Qg Y2hhciogaW50cmluc2ljTmFtZShJbnRyaW5zaWMgaW50cmluc2ljKQogICAgICAgICByZXR1cm4g IkRhdGFWaWV3U2V0RmxvYXQzMiI7CiAgICAgY2FzZSBEYXRhVmlld1NldEZsb2F0NjQ6CiAgICAg ICAgIHJldHVybiAiRGF0YVZpZXdTZXRGbG9hdDY0IjsKKyAgICBjYXNlIFdhc21GdW5jdGlvbklu dHJpbnNpYzoKKyAgICAgICAgcmV0dXJuICJXYXNtRnVuY3Rpb25JbnRyaW5zaWMiOwogICAgIH0K ICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBudWxscHRyOwpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50cmluc2ljLmggYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRyaW5zaWMuaAppbmRleCA1Y2YyNTBlOTcx MzQ3YjI1NjQ4ZWE2YzZkMWRiNzVkOTUyNWE4MWE0Li43YTljZDcwMjllMzhmZGMzZjExMDUwOTE0 ZDRkZDIwYjUzZGEzNTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9JbnRyaW5zaWMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRyaW5z aWMuaApAQCAtMTkyLDYgKzE5Miw4IEBAIGVudW0gSW50cmluc2ljIDogdWludDhfdCB7CiAgICAg RGF0YVZpZXdTZXRVaW50MzIsCiAgICAgRGF0YVZpZXdTZXRGbG9hdDMyLAogICAgIERhdGFWaWV3 U2V0RmxvYXQ2NCwKKworICAgIFdhc21GdW5jdGlvbkludHJpbnNpYywKIH07CiAKIE9wdGlvbmFs PEl0ZXJhdGlvbktpbmQ+IGludGVyYXRpb25LaW5kRm9ySW50cmluc2ljKEludHJpbnNpYyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUZ1bmN0 aW9uLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rp b24uY3BwCmluZGV4IDQzNDI5Njk1M2E4MzA2ZWU0MmE1OGE2YmE3MzQwN2I2ZDA5NTFlYjAuLjRi N2Q4NmM5Mzg5ZWUxNzdjMjExNDcyMTIzY2ZlNTJlNzhiMTlkZjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCkBAIC00 MzQsNyArNDM0LDcgQEAgTWFjcm9Bc3NlbWJsZXJDb2RlUHRyPEpTRW50cnlQdHJUYWc+IFdlYkFz c2VtYmx5RnVuY3Rpb246OmpzQ2FsbEVudHJ5cG9pbnRTbG93KCkKIAogV2ViQXNzZW1ibHlGdW5j dGlvbiogV2ViQXNzZW1ibHlGdW5jdGlvbjo6Y3JlYXRlKFZNJiB2bSwgSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIHVuc2lnbmVkIGxlbmd0aCwgY29u c3QgU3RyaW5nJiBuYW1lLCBKU1dlYkFzc2VtYmx5SW5zdGFuY2UqIGluc3RhbmNlLCBXYXNtOjpD YWxsZWUmIGpzRW50cnlwb2ludCwgV2FzbTo6V2FzbVRvV2FzbUltcG9ydGFibGVGdW5jdGlvbjo6 TG9hZExvY2F0aW9uIHdhc21Ub1dhc21FbnRyeXBvaW50TG9hZExvY2F0aW9uLCBXYXNtOjpTaWdu YXR1cmVJbmRleCBzaWduYXR1cmVJbmRleCkKIHsKLSAgICBOYXRpdmVFeGVjdXRhYmxlKiBleGVj dXRhYmxlID0gdm0uZ2V0SG9zdEZ1bmN0aW9uKGNhbGxXZWJBc3NlbWJseUZ1bmN0aW9uLCBOb0lu dHJpbnNpYywgY2FsbEhvc3RGdW5jdGlvbkFzQ29uc3RydWN0b3IsIG51bGxwdHIsIG5hbWUpOwor ICAgIE5hdGl2ZUV4ZWN1dGFibGUqIGV4ZWN1dGFibGUgPSB2bS5nZXRIb3N0RnVuY3Rpb24oY2Fs bFdlYkFzc2VtYmx5RnVuY3Rpb24sIFdhc21GdW5jdGlvbkludHJpbnNpYywgY2FsbEhvc3RGdW5j dGlvbkFzQ29uc3RydWN0b3IsIG51bGxwdHIsIG5hbWUpOwogICAgIFdlYkFzc2VtYmx5RnVuY3Rp b24qIGZ1bmN0aW9uID0gbmV3IChOb3ROdWxsLCBhbGxvY2F0ZUNlbGw8V2ViQXNzZW1ibHlGdW5j dGlvbj4odm0uaGVhcCkpIFdlYkFzc2VtYmx5RnVuY3Rpb24odm0sIGV4ZWN1dGFibGUsIGdsb2Jh bE9iamVjdCwgc3RydWN0dXJlLCBqc0VudHJ5cG9pbnQsIHdhc21Ub1dhc21FbnRyeXBvaW50TG9h ZExvY2F0aW9uLCBzaWduYXR1cmVJbmRleCk7CiAgICAgZnVuY3Rpb24tPmZpbmlzaENyZWF0aW9u KHZtLCBleGVjdXRhYmxlLCBsZW5ndGgsIG5hbWUsIGluc3RhbmNlKTsKICAgICByZXR1cm4gZnVu Y3Rpb247Cg==