189498 2018-09-11 05:00:05 -0700 [WebAssembly] Move type conversion code of JSToWasm return type to JS wasm wrapper 2018-10-01 02:26:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1458442 0 ysuzuki 2018-09-11 05:00:05 -0700 [WebAssembly] Move type conversion code of JSToWasm return type to JS wasm wrapper 1458443 1 349390 ysuzuki 2018-09-11 05:03:10 -0700 Created attachment 349390 Patch 1458444 2 349391 ysuzuki 2018-09-11 05:06:34 -0700 Created attachment 349391 Patch 1458455 3 ysuzuki 2018-09-11 05:56:56 -0700 Eventually I would like to merge these code into wrapper side. 1463534 4 ysuzuki 2018-09-26 01:38:46 -0700 Ping? 1464872 5 349391 saam 2018-09-30 11:46:50 -0700 Comment on attachment 349391 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349391&action=review r=me > Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp:164 > + return rawResult; Is there any value in keeping the above code in some form for a debug assert? 1464873 6 349391 saam 2018-09-30 11:48:26 -0700 Comment on attachment 349391 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349391&action=review > Source/JavaScriptCore/wasm/js/JSToWasm.cpp:223 > + auto isNaN = jit.branchDouble(CCallHelpers::DoubleNotEqualOrUnordered, FPRInfo::returnValueFPR, FPRInfo::returnValueFPR); We should really just add something in AssemblyHelpers sometime in the future for branchIfNaN 1464917 7 349391 ysuzuki 2018-10-01 02:24:04 -0700 Comment on attachment 349391 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349391&action=review >> Source/JavaScriptCore/wasm/js/JSToWasm.cpp:223 >> + auto isNaN = jit.branchDouble(CCallHelpers::DoubleNotEqualOrUnordered, FPRInfo::returnValueFPR, FPRInfo::returnValueFPR); > > We should really just add something in AssemblyHelpers sometime in the future for branchIfNaN Sounds fine. I'll add this in a separate patch. >> Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp:164 >> + return rawResult; > > Is there any value in keeping the above code in some form for a debug assert? Eventually, I would like to remove this entire function to merge this functionality into the generated code. So I think we should add assertions in the generated code instead of this function. 1464918 8 ysuzuki 2018-10-01 02:25:46 -0700 Committed r236651: <https://trac.webkit.org/changeset/236651> 1464920 9 webkit-bug-importer 2018-10-01 02:26:28 -0700 <rdar://problem/44904397> 349390 2018-09-11 05:03:10 -0700 2018-09-11 05:06:32 -0700 Patch bug-189498-20180911210309.patch text/plain 6213 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl NjBhYmVlNDE4OWYxNDQyYWZjNTJjNTk4MDk5MzA1YTIwMTc1ZWQxLi4zMTQwNjA5YzRjMmU4MWY3 NTBkOWNiODVjYTg5MDg1OWZhNTMxZTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEg KzEsMjUgQEAKKzIwMTgtMDktMTEgIFl1c3VrZSBTdXp1a2kgIDx5dXN1a2VzdXp1a2lAc2xvd3N0 YXJ0Lm9yZz4KKworICAgICAgICBbV2ViQXNzZW1ibHldIE1vdmUgdHlwZSBjb252ZXJzaW9uIGNv ZGUgb2YgSlNUb1dhc20gcmV0dXJuIHR5cGUgdG8gSlMgd2FzbSB3cmFwcGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk0OTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBjYWxsIEpTLXRvLVdhc20g Y29kZSB3ZSBuZWVkIHRvIGNvbnZlcnQgdGhlIHJlc3VsdCB2YWx1ZSBmcm9tIHdhc20gZnVuY3Rp b24gdG8KKyAgICAgICAgdGhlIEpTIHR5cGUuIFByZXZpb3VzbHkgdGhpcyBpcyBkb25lIGJ5IGNh bGxXZWJBc3NlbWJseUZ1bmN0aW9uIGJ5IHVzaW5nIHN3dGljaAorICAgICAgICBvdmVyIHNpZ25h dHVyZS5yZXR1cm5UeXBlKCkuIEJ1dCBzaW5jZSB3ZSBrbm93IHRoZSB2YWx1ZSBvZiBgc2lnbmF0 dXJlLnJldHVyblR5cGUoKWAKKyAgICAgICAgYXQgY29tcGlsaW5nIHBoYXNlLCB3ZSBjYW4gZW1p dCBhIHNtYWxsIGNvbnZlcnNpb24gY29kZSBkaXJlY3RseSB0byBKU1RvV2FzbSBnbHVlCisgICAg ICAgIGFuZCByZW1vdmUgdGhpcyBzd2l0Y2ggZnJvbSBjYWxsV2ViQXNzZW1ibHlGdW5jdGlvbi4K KworICAgICAgICBJbiBKU1RvV2FzbSBnbHVlIGNvZGUsIHdlIGRvIG5vdCBoYXZlIHRhZyByZWdp c3RlcnMuIFNvIHdlIHVzZSBEb05vdEhhdmVUYWdSZWdpc3RlcnMKKyAgICAgICAgaW4gYm94SW50 MzIgYW5kIGJveERvdWJsZS4gU2luY2UgYm94RG91YmxlIGRvZXMgbm90IGhhdmUgRG9Ob3RIYXZl VGFnUmVnaXN0ZXJzIHZlcnNpb24sCisgICAgICAgIHdlIGFkZCBhbiBpbXBsZW1lbnRhdGlvbiBm b3IgdGhhdC4KKworICAgICAgICAqIGppdC9Bc3NlbWJseUhlbHBlcnMuaDoKKyAgICAgICAgKEpT Qzo6QXNzZW1ibHlIZWxwZXJzOjpib3hEb3VibGUpOgorICAgICAgICAqIHdhc20vanMvSlNUb1dh c20uY3BwOgorICAgICAgICAoSlNDOjpXYXNtOjpjcmVhdGVKU1RvV2FzbVdyYXBwZXIpOgorICAg ICAgICAqIHdhc20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHA6CisgICAgICAgIChKU0M6OmNh bGxXZWJBc3NlbWJseUZ1bmN0aW9uKToKKwogPT0gUm9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIw MTgtMDktMTEgPT0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1i bHlIZWxwZXJzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5o CmluZGV4IDAxNzMxYTViMWIxZmZkNzgzMjBkZTc2YzUyZjM0YWQ2YjRkODVhNTUuLjlmMWQzMGJh NDM5NDg4ZWViMDJmNmRhZmFmYjBiOGMwMDU2YTYwOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9Bc3NlbWJseUhlbHBlcnMuaApAQCAtMTI0NCwxMSArMTI0NCwxNSBAQCBjbGFzcyBB c3NlbWJseUhlbHBlcnMgOiBwdWJsaWMgTWFjcm9Bc3NlbWJsZXIgewogCiAgICAgLy8gVGhlc2Ug bWV0aG9kcyBjb252ZXJ0IGJldHdlZW4gZG91YmxlcywgYW5kIGRvdWJsZXMgYm94ZWQgYW5kIEpT VmFsdWVzLgogI2lmIFVTRShKU1ZBTFVFNjQpCi0gICAgR1BSUmVnIGJveERvdWJsZShGUFJSZWcg ZnByLCBHUFJSZWcgZ3ByKQorICAgIEdQUlJlZyBib3hEb3VibGUoRlBSUmVnIGZwciwgR1BSUmVn IGdwciwgVGFnUmVnaXN0ZXJzTW9kZSBtb2RlID0gSGF2ZVRhZ1JlZ2lzdGVycykKICAgICB7CiAg ICAgICAgIG1vdmVEb3VibGVUbzY0KGZwciwgZ3ByKTsKLSAgICAgICAgc3ViNjQoR1BSSW5mbzo6 dGFnVHlwZU51bWJlclJlZ2lzdGVyLCBncHIpOwotICAgICAgICBqaXRBc3NlcnRJc0pTRG91Ymxl KGdwcik7CisgICAgICAgIGlmIChtb2RlID09IERvTm90SGF2ZVRhZ1JlZ2lzdGVycykKKyAgICAg ICAgICAgIHN1YjY0KFRydXN0ZWRJbW02NChUYWdUeXBlTnVtYmVyKSwgZ3ByKTsKKyAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICBzdWI2NChHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXIs IGdwcik7CisgICAgICAgICAgICBqaXRBc3NlcnRJc0pTRG91YmxlKGdwcik7CisgICAgICAgIH0K ICAgICAgICAgcmV0dXJuIGdwcjsKICAgICB9CiAgICAgRlBSUmVnIHVuYm94RG91YmxlV2l0aG91 dEFzc2VydGlvbnMoR1BSUmVnIGdwciwgR1BSUmVnIHJlc3VsdEdQUiwgRlBSUmVnIGZwcikKQEAg LTEyNjMsOSArMTI2Nyw5IEBAIGNsYXNzIEFzc2VtYmx5SGVscGVycyA6IHB1YmxpYyBNYWNyb0Fz c2VtYmxlciB7CiAgICAgICAgIHJldHVybiB1bmJveERvdWJsZVdpdGhvdXRBc3NlcnRpb25zKGdw ciwgcmVzdWx0R1BSLCBmcHIpOwogICAgIH0KICAgICAKLSAgICB2b2lkIGJveERvdWJsZShGUFJS ZWcgZnByLCBKU1ZhbHVlUmVncyByZWdzKQorICAgIHZvaWQgYm94RG91YmxlKEZQUlJlZyBmcHIs IEpTVmFsdWVSZWdzIHJlZ3MsIFRhZ1JlZ2lzdGVyc01vZGUgbW9kZSA9IEhhdmVUYWdSZWdpc3Rl cnMpCiAgICAgewotICAgICAgICBib3hEb3VibGUoZnByLCByZWdzLmdwcigpKTsKKyAgICAgICAg Ym94RG91YmxlKGZwciwgcmVncy5ncHIoKSwgbW9kZSk7CiAgICAgfQogCiAgICAgdm9pZCB1bmJv eERvdWJsZU5vbkRlc3RydWN0aXZlKEpTVmFsdWVSZWdzIHJlZ3MsIEZQUlJlZyBkZXN0RlBSLCBH UFJSZWcgcmVzdWx0R1BSLCBGUFJSZWcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9qcy9KU1RvV2FzbS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9K U1RvV2FzbS5jcHAKaW5kZXggMzY0ZjdjNzRiYzE5ZmM1NWJmMmFkNjliYWQ0OTBlY2VlZWU5MTlk YS4uNjczZGY3YWU0YThiNGJmZDZkYWUxM2YwNmEwNjA3NzA3NzkyNDA5YyAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNUb1dhc20uY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTVG9XYXNtLmNwcApAQCAtMjA4LDExICsyMDgsMjggQEAg c3RkOjp1bmlxdWVfcHRyPEludGVybmFsRnVuY3Rpb24+IGNyZWF0ZUpTVG9XYXNtV3JhcHBlcihD b21waWxhdGlvbkNvbnRleHQmIGNvbXAKICAgICB9CiAKICAgICBzd2l0Y2ggKHNpZ25hdHVyZS5y ZXR1cm5UeXBlKCkpIHsKLSAgICBjYXNlIFdhc206OkYzMjoKLSAgICAgICAgaml0Lm1vdmVGbG9h dFRvMzIoRlBSSW5mbzo6cmV0dXJuVmFsdWVGUFIsIEdQUkluZm86OnJldHVyblZhbHVlR1BSKTsK KyAgICBjYXNlIFdhc206OlZvaWQ6CisgICAgICAgIGppdC5tb3ZlVHJ1c3RlZFZhbHVlKGpzVW5k ZWZpbmVkKCksIEpTVmFsdWVSZWdzIHsgR1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIgfSk7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgV2FzbTo6STMyOgorICAgICAgICBqaXQuemVyb0V4dGVuZDMy VG9QdHIoR1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIsIEdQUkluZm86OnJldHVyblZhbHVlR1BSKTsK KyAgICAgICAgaml0LmJveEludDMyKEdQUkluZm86OnJldHVyblZhbHVlR1BSLCBKU1ZhbHVlUmVn cyB7IEdQUkluZm86OnJldHVyblZhbHVlR1BSIH0sIERvTm90SGF2ZVRhZ1JlZ2lzdGVycyk7CiAg ICAgICAgIGJyZWFrOwotICAgIGNhc2UgV2FzbTo6RjY0OgorICAgIGNhc2UgV2FzbTo6RjMyOgor ICAgICAgICBqaXQuY29udmVydEZsb2F0VG9Eb3VibGUoRlBSSW5mbzo6cmV0dXJuVmFsdWVGUFIs IEZQUkluZm86OnJldHVyblZhbHVlRlBSKTsKKyAgICAgICAgRkFMTFRIUk9VR0g7CisgICAgY2Fz ZSBXYXNtOjpGNjQ6IHsKKyAgICAgICAgaml0Lm1vdmVUcnVzdGVkVmFsdWUoanNOdW1iZXIocHVy ZU5hTigpKSwgSlNWYWx1ZVJlZ3MgeyBHUFJJbmZvOjpyZXR1cm5WYWx1ZUdQUiB9KTsKKyAgICAg ICAgYXV0byBpc05hTiA9IGppdC5icmFuY2hEb3VibGUoQ0NhbGxIZWxwZXJzOjpEb3VibGVOb3RF cXVhbE9yVW5vcmRlcmVkLCBGUFJJbmZvOjpyZXR1cm5WYWx1ZUZQUiwgRlBSSW5mbzo6cmV0dXJu VmFsdWVGUFIpOwogICAgICAgICBqaXQubW92ZURvdWJsZVRvNjQoRlBSSW5mbzo6cmV0dXJuVmFs dWVGUFIsIEdQUkluZm86OnJldHVyblZhbHVlR1BSKTsKKyAgICAgICAgaml0LmJveERvdWJsZShG UFJJbmZvOjpyZXR1cm5WYWx1ZUZQUiwgSlNWYWx1ZVJlZ3MgeyBHUFJJbmZvOjpyZXR1cm5WYWx1 ZUdQUiB9LCBEb05vdEhhdmVUYWdSZWdpc3RlcnMpOworICAgICAgICBpc05hTi5saW5rKCZqaXQp OworICAgICAgICBicmVhazsKKyAgICB9CisgICAgY2FzZSBXYXNtOjpJNjQ6CisgICAgY2FzZSBX YXNtOjpGdW5jOgorICAgIGNhc2UgV2FzbTo6QW55ZnVuYzoKKyAgICAgICAgaml0LmJyZWFrcG9p bnQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUZ1bmN0aW9u LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24u Y3BwCmluZGV4IDVkYjkyNGY4ZWNmYjAzYTdlMGJhNmY1ZDA4NDgyMmIzNDcxMWJhYzcuLmYyMTY4 OTYzNGQ1MjJkYTk3NWRkYmM1NDBlZTJhYmM3MDM2MmM5MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCkBAIC0xNjEs MjIgKzE2MSw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNhbGxXZWJB c3NlbWJseUZ1bmN0aW9uKEV4ZWNTdGF0ZSogZXhlYykKICAgICB2bS53YXNtQ29udGV4dC5zdG9y ZShwcmV2V2FzbUluc3RhbmNlLCB2bS5zb2Z0U3RhY2tMaW1pdCgpKTsKICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogCi0gICAgc3dpdGNoIChzaWduYXR1cmUucmV0dXJuVHlw ZSgpKSB7Ci0gICAgY2FzZSBXYXNtOjpWb2lkOgotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKGpzVW5kZWZpbmVkKCkpOwotICAgIGNhc2UgV2FzbTo6STMyOgotICAgICAgICByZXR1cm4g SlNWYWx1ZTo6ZW5jb2RlKGpzTnVtYmVyKHN0YXRpY19jYXN0PGludDMyX3Q+KHJhd1Jlc3VsdCkp KTsKLSAgICBjYXNlIFdhc206OkYzMjoKLSAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShq c051bWJlcihwdXJpZnlOYU4oc3RhdGljX2Nhc3Q8ZG91YmxlPihiaXR3aXNlX2Nhc3Q8ZmxvYXQ+ KHN0YXRpY19jYXN0PGludDMyX3Q+KHJhd1Jlc3VsdCkpKSkpKTsKLSAgICBjYXNlIFdhc206OkY2 NDoKLSAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc051bWJlcihwdXJpZnlOYU4oYml0 d2lzZV9jYXN0PGRvdWJsZT4ocmF3UmVzdWx0KSkpKTsKLSAgICBjYXNlIFdhc206Okk2NDoKLSAg ICBjYXNlIFdhc206OkZ1bmM6Ci0gICAgY2FzZSBXYXNtOjpBbnlmdW5jOgotICAgICAgICBSRUxF QVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIH0KLQotICAgIHJldHVybiBFbmNvZGVkSlNW YWx1ZSgpOworICAgIHJldHVybiByYXdSZXN1bHQ7CiB9CiAKIFdlYkFzc2VtYmx5RnVuY3Rpb24q IFdlYkFzc2VtYmx5RnVuY3Rpb246OmNyZWF0ZShWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBnbG9i YWxPYmplY3QsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgU3RyaW5nJiBuYW1lLCBKU1dlYkFzc2Vt Ymx5SW5zdGFuY2UqIGluc3RhbmNlLCBXYXNtOjpDYWxsZWUmIGpzRW50cnlwb2ludCwgV2FzbTo6 V2FzbVRvV2FzbUltcG9ydGFibGVGdW5jdGlvbjo6TG9hZExvY2F0aW9uIHdhc21Ub1dhc21FbnRy eXBvaW50TG9hZExvY2F0aW9uLCBXYXNtOjpTaWduYXR1cmVJbmRleCBzaWduYXR1cmVJbmRleCkK 349391 2018-09-11 05:06:34 -0700 2018-09-30 11:46:50 -0700 Patch bug-189498-20180911210633.patch text/plain 6192 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl NjBhYmVlNDE4OWYxNDQyYWZjNTJjNTk4MDk5MzA1YTIwMTc1ZWQxLi4zMTQwNjA5YzRjMmU4MWY3 NTBkOWNiODVjYTg5MDg1OWZhNTMxZTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEg KzEsMjUgQEAKKzIwMTgtMDktMTEgIFl1c3VrZSBTdXp1a2kgIDx5dXN1a2VzdXp1a2lAc2xvd3N0 YXJ0Lm9yZz4KKworICAgICAgICBbV2ViQXNzZW1ibHldIE1vdmUgdHlwZSBjb252ZXJzaW9uIGNv ZGUgb2YgSlNUb1dhc20gcmV0dXJuIHR5cGUgdG8gSlMgd2FzbSB3cmFwcGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk0OTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBjYWxsIEpTLXRvLVdhc20g Y29kZSB3ZSBuZWVkIHRvIGNvbnZlcnQgdGhlIHJlc3VsdCB2YWx1ZSBmcm9tIHdhc20gZnVuY3Rp b24gdG8KKyAgICAgICAgdGhlIEpTIHR5cGUuIFByZXZpb3VzbHkgdGhpcyBpcyBkb25lIGJ5IGNh bGxXZWJBc3NlbWJseUZ1bmN0aW9uIGJ5IHVzaW5nIHN3dGljaAorICAgICAgICBvdmVyIHNpZ25h dHVyZS5yZXR1cm5UeXBlKCkuIEJ1dCBzaW5jZSB3ZSBrbm93IHRoZSB2YWx1ZSBvZiBgc2lnbmF0 dXJlLnJldHVyblR5cGUoKWAKKyAgICAgICAgYXQgY29tcGlsaW5nIHBoYXNlLCB3ZSBjYW4gZW1p dCBhIHNtYWxsIGNvbnZlcnNpb24gY29kZSBkaXJlY3RseSB0byBKU1RvV2FzbSBnbHVlCisgICAg ICAgIGFuZCByZW1vdmUgdGhpcyBzd2l0Y2ggZnJvbSBjYWxsV2ViQXNzZW1ibHlGdW5jdGlvbi4K KworICAgICAgICBJbiBKU1RvV2FzbSBnbHVlIGNvZGUsIHdlIGRvIG5vdCBoYXZlIHRhZyByZWdp c3RlcnMuIFNvIHdlIHVzZSBEb05vdEhhdmVUYWdSZWdpc3RlcnMKKyAgICAgICAgaW4gYm94SW50 MzIgYW5kIGJveERvdWJsZS4gU2luY2UgYm94RG91YmxlIGRvZXMgbm90IGhhdmUgRG9Ob3RIYXZl VGFnUmVnaXN0ZXJzIHZlcnNpb24sCisgICAgICAgIHdlIGFkZCBhbiBpbXBsZW1lbnRhdGlvbiBm b3IgdGhhdC4KKworICAgICAgICAqIGppdC9Bc3NlbWJseUhlbHBlcnMuaDoKKyAgICAgICAgKEpT Qzo6QXNzZW1ibHlIZWxwZXJzOjpib3hEb3VibGUpOgorICAgICAgICAqIHdhc20vanMvSlNUb1dh c20uY3BwOgorICAgICAgICAoSlNDOjpXYXNtOjpjcmVhdGVKU1RvV2FzbVdyYXBwZXIpOgorICAg ICAgICAqIHdhc20vanMvV2ViQXNzZW1ibHlGdW5jdGlvbi5jcHA6CisgICAgICAgIChKU0M6OmNh bGxXZWJBc3NlbWJseUZ1bmN0aW9uKToKKwogPT0gUm9sbGVkIG92ZXIgdG8gQ2hhbmdlTG9nLTIw MTgtMDktMTEgPT0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1i bHlIZWxwZXJzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5o CmluZGV4IDAxNzMxYTViMWIxZmZkNzgzMjBkZTc2YzUyZjM0YWQ2YjRkODVhNTUuLjlmMWQzMGJh NDM5NDg4ZWViMDJmNmRhZmFmYjBiOGMwMDU2YTYwOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9Bc3NlbWJseUhlbHBlcnMuaApAQCAtMTI0NCwxMSArMTI0NCwxNSBAQCBjbGFzcyBB c3NlbWJseUhlbHBlcnMgOiBwdWJsaWMgTWFjcm9Bc3NlbWJsZXIgewogCiAgICAgLy8gVGhlc2Ug bWV0aG9kcyBjb252ZXJ0IGJldHdlZW4gZG91YmxlcywgYW5kIGRvdWJsZXMgYm94ZWQgYW5kIEpT VmFsdWVzLgogI2lmIFVTRShKU1ZBTFVFNjQpCi0gICAgR1BSUmVnIGJveERvdWJsZShGUFJSZWcg ZnByLCBHUFJSZWcgZ3ByKQorICAgIEdQUlJlZyBib3hEb3VibGUoRlBSUmVnIGZwciwgR1BSUmVn IGdwciwgVGFnUmVnaXN0ZXJzTW9kZSBtb2RlID0gSGF2ZVRhZ1JlZ2lzdGVycykKICAgICB7CiAg ICAgICAgIG1vdmVEb3VibGVUbzY0KGZwciwgZ3ByKTsKLSAgICAgICAgc3ViNjQoR1BSSW5mbzo6 dGFnVHlwZU51bWJlclJlZ2lzdGVyLCBncHIpOwotICAgICAgICBqaXRBc3NlcnRJc0pTRG91Ymxl KGdwcik7CisgICAgICAgIGlmIChtb2RlID09IERvTm90SGF2ZVRhZ1JlZ2lzdGVycykKKyAgICAg ICAgICAgIHN1YjY0KFRydXN0ZWRJbW02NChUYWdUeXBlTnVtYmVyKSwgZ3ByKTsKKyAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICBzdWI2NChHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXIs IGdwcik7CisgICAgICAgICAgICBqaXRBc3NlcnRJc0pTRG91YmxlKGdwcik7CisgICAgICAgIH0K ICAgICAgICAgcmV0dXJuIGdwcjsKICAgICB9CiAgICAgRlBSUmVnIHVuYm94RG91YmxlV2l0aG91 dEFzc2VydGlvbnMoR1BSUmVnIGdwciwgR1BSUmVnIHJlc3VsdEdQUiwgRlBSUmVnIGZwcikKQEAg LTEyNjMsOSArMTI2Nyw5IEBAIGNsYXNzIEFzc2VtYmx5SGVscGVycyA6IHB1YmxpYyBNYWNyb0Fz c2VtYmxlciB7CiAgICAgICAgIHJldHVybiB1bmJveERvdWJsZVdpdGhvdXRBc3NlcnRpb25zKGdw ciwgcmVzdWx0R1BSLCBmcHIpOwogICAgIH0KICAgICAKLSAgICB2b2lkIGJveERvdWJsZShGUFJS ZWcgZnByLCBKU1ZhbHVlUmVncyByZWdzKQorICAgIHZvaWQgYm94RG91YmxlKEZQUlJlZyBmcHIs IEpTVmFsdWVSZWdzIHJlZ3MsIFRhZ1JlZ2lzdGVyc01vZGUgbW9kZSA9IEhhdmVUYWdSZWdpc3Rl cnMpCiAgICAgewotICAgICAgICBib3hEb3VibGUoZnByLCByZWdzLmdwcigpKTsKKyAgICAgICAg Ym94RG91YmxlKGZwciwgcmVncy5ncHIoKSwgbW9kZSk7CiAgICAgfQogCiAgICAgdm9pZCB1bmJv eERvdWJsZU5vbkRlc3RydWN0aXZlKEpTVmFsdWVSZWdzIHJlZ3MsIEZQUlJlZyBkZXN0RlBSLCBH UFJSZWcgcmVzdWx0R1BSLCBGUFJSZWcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9qcy9KU1RvV2FzbS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9K U1RvV2FzbS5jcHAKaW5kZXggMzY0ZjdjNzRiYzE5ZmM1NWJmMmFkNjliYWQ0OTBlY2VlZWU5MTlk YS4uY2QyNGM3YjhmNGZiZmViNmE1OTRjMjVhMTcwMDkxMzc0ZjI5Yjc1NiAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvSlNUb1dhc20uY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS93YXNtL2pzL0pTVG9XYXNtLmNwcApAQCAtMjA4LDExICsyMDgsMjcgQEAg c3RkOjp1bmlxdWVfcHRyPEludGVybmFsRnVuY3Rpb24+IGNyZWF0ZUpTVG9XYXNtV3JhcHBlcihD b21waWxhdGlvbkNvbnRleHQmIGNvbXAKICAgICB9CiAKICAgICBzd2l0Y2ggKHNpZ25hdHVyZS5y ZXR1cm5UeXBlKCkpIHsKKyAgICBjYXNlIFdhc206OlZvaWQ6CisgICAgICAgIGppdC5tb3ZlVHJ1 c3RlZFZhbHVlKGpzVW5kZWZpbmVkKCksIEpTVmFsdWVSZWdzIHsgR1BSSW5mbzo6cmV0dXJuVmFs dWVHUFIgfSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV2FzbTo6STMyOgorICAgICAgICBq aXQuemVyb0V4dGVuZDMyVG9QdHIoR1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIsIEdQUkluZm86OnJl dHVyblZhbHVlR1BSKTsKKyAgICAgICAgaml0LmJveEludDMyKEdQUkluZm86OnJldHVyblZhbHVl R1BSLCBKU1ZhbHVlUmVncyB7IEdQUkluZm86OnJldHVyblZhbHVlR1BSIH0sIERvTm90SGF2ZVRh Z1JlZ2lzdGVycyk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2FzbTo6RjMyOgotICAgICAg ICBqaXQubW92ZUZsb2F0VG8zMihGUFJJbmZvOjpyZXR1cm5WYWx1ZUZQUiwgR1BSSW5mbzo6cmV0 dXJuVmFsdWVHUFIpOworICAgICAgICBqaXQuY29udmVydEZsb2F0VG9Eb3VibGUoRlBSSW5mbzo6 cmV0dXJuVmFsdWVGUFIsIEZQUkluZm86OnJldHVyblZhbHVlRlBSKTsKKyAgICAgICAgRkFMTFRI Uk9VR0g7CisgICAgY2FzZSBXYXNtOjpGNjQ6IHsKKyAgICAgICAgaml0Lm1vdmVUcnVzdGVkVmFs dWUoanNOdW1iZXIocHVyZU5hTigpKSwgSlNWYWx1ZVJlZ3MgeyBHUFJJbmZvOjpyZXR1cm5WYWx1 ZUdQUiB9KTsKKyAgICAgICAgYXV0byBpc05hTiA9IGppdC5icmFuY2hEb3VibGUoQ0NhbGxIZWxw ZXJzOjpEb3VibGVOb3RFcXVhbE9yVW5vcmRlcmVkLCBGUFJJbmZvOjpyZXR1cm5WYWx1ZUZQUiwg RlBSSW5mbzo6cmV0dXJuVmFsdWVGUFIpOworICAgICAgICBqaXQuYm94RG91YmxlKEZQUkluZm86 OnJldHVyblZhbHVlRlBSLCBKU1ZhbHVlUmVncyB7IEdQUkluZm86OnJldHVyblZhbHVlR1BSIH0s IERvTm90SGF2ZVRhZ1JlZ2lzdGVycyk7CisgICAgICAgIGlzTmFOLmxpbmsoJmppdCk7CiAgICAg ICAgIGJyZWFrOwotICAgIGNhc2UgV2FzbTo6RjY0OgotICAgICAgICBqaXQubW92ZURvdWJsZVRv NjQoRlBSSW5mbzo6cmV0dXJuVmFsdWVGUFIsIEdQUkluZm86OnJldHVyblZhbHVlR1BSKTsKKyAg ICB9CisgICAgY2FzZSBXYXNtOjpJNjQ6CisgICAgY2FzZSBXYXNtOjpGdW5jOgorICAgIGNhc2Ug V2FzbTo6QW55ZnVuYzoKKyAgICAgICAgaml0LmJyZWFrcG9pbnQoKTsKICAgICAgICAgYnJlYWs7 CiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUZ1bmN0aW9uLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS93YXNtL2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCmluZGV4IDVkYjkyNGY4ZWNm YjAzYTdlMGJhNmY1ZDA4NDgyMmIzNDcxMWJhYzcuLmYyMTY4OTYzNGQ1MjJkYTk3NWRkYmM1NDBl ZTJhYmM3MDM2MmM5MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL2pz L1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L2pzL1dlYkFzc2VtYmx5RnVuY3Rpb24uY3BwCkBAIC0xNjEsMjIgKzE2MSw3IEBAIHN0YXRpYyBF bmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNhbGxXZWJBc3NlbWJseUZ1bmN0aW9uKEV4ZWNT dGF0ZSogZXhlYykKICAgICB2bS53YXNtQ29udGV4dC5zdG9yZShwcmV2V2FzbUluc3RhbmNlLCB2 bS5zb2Z0U3RhY2tMaW1pdCgpKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0p OwogCi0gICAgc3dpdGNoIChzaWduYXR1cmUucmV0dXJuVHlwZSgpKSB7Ci0gICAgY2FzZSBXYXNt OjpWb2lkOgotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwot ICAgIGNhc2UgV2FzbTo6STMyOgotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTnVt YmVyKHN0YXRpY19jYXN0PGludDMyX3Q+KHJhd1Jlc3VsdCkpKTsKLSAgICBjYXNlIFdhc206OkYz MjoKLSAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc051bWJlcihwdXJpZnlOYU4oc3Rh dGljX2Nhc3Q8ZG91YmxlPihiaXR3aXNlX2Nhc3Q8ZmxvYXQ+KHN0YXRpY19jYXN0PGludDMyX3Q+ KHJhd1Jlc3VsdCkpKSkpKTsKLSAgICBjYXNlIFdhc206OkY2NDoKLSAgICAgICAgcmV0dXJuIEpT VmFsdWU6OmVuY29kZShqc051bWJlcihwdXJpZnlOYU4oYml0d2lzZV9jYXN0PGRvdWJsZT4ocmF3 UmVzdWx0KSkpKTsKLSAgICBjYXNlIFdhc206Okk2NDoKLSAgICBjYXNlIFdhc206OkZ1bmM6Ci0g ICAgY2FzZSBXYXNtOjpBbnlmdW5jOgotICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hF RCgpOwotICAgIH0KLQotICAgIHJldHVybiBFbmNvZGVkSlNWYWx1ZSgpOworICAgIHJldHVybiBy YXdSZXN1bHQ7CiB9CiAKIFdlYkFzc2VtYmx5RnVuY3Rpb24qIFdlYkFzc2VtYmx5RnVuY3Rpb246 OmNyZWF0ZShWTSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIHVuc2lnbmVkIGxl bmd0aCwgY29uc3QgU3RyaW5nJiBuYW1lLCBKU1dlYkFzc2VtYmx5SW5zdGFuY2UqIGluc3RhbmNl LCBXYXNtOjpDYWxsZWUmIGpzRW50cnlwb2ludCwgV2FzbTo6V2FzbVRvV2FzbUltcG9ydGFibGVG dW5jdGlvbjo6TG9hZExvY2F0aW9uIHdhc21Ub1dhc21FbnRyeXBvaW50TG9hZExvY2F0aW9uLCBX YXNtOjpTaWduYXR1cmVJbmRleCBzaWduYXR1cmVJbmRleCkK