170312 2017-03-30 16:27:04 -0700 WebAssembly: Strip WasmParser and WasmFunctionParser from knowing about VM 2017-03-31 16:08:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 168264 1 saam saam benjamin fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff ticaiolima ysuzuki oldest_to_newest 1293018 0 saam 2017-03-30 16:27:04 -0700 ... 1293035 1 saam 2017-03-30 17:11:31 -0700 This will mean Signature should no longer care about VM. Should be easy. 1293337 2 306021 saam 2017-03-31 15:45:49 -0700 Created attachment 306021 patch 1293341 3 306021 jfbastien 2017-03-31 15:50:45 -0700 Comment on attachment 306021 patch lol why was there ever a VM? lgtm 1293346 4 306021 mark.lam 2017-03-31 16:05:06 -0700 Comment on attachment 306021 patch r=me 1293349 5 saam 2017-03-31 16:08:21 -0700 landed in: https://trac.webkit.org/changeset/214695/webkit 306021 2017-03-31 15:45:49 -0700 2017-03-31 16:05:06 -0700 patch b-backup.diff text/plain 12073 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE0NjkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE3LTAzLTMxICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFdlYkFzc2VtYmx5OiBTdHJpcCBXYXNtUGFyc2VyIGFuZCBXYXNtRnVuY3Rpb25QYXJzZXIgZnJv bSBrbm93aW5nIGFib3V0IFZNCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzAzMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIGlzIGFub3RoZXIgc3RlcCB0b3dhcmRzIFBJQy1pZnlpbmcgV2FzbS4g VGhpcyBwYXRjaCByZW1vdmVzCisgICAgICAgIHRoZSBWTSBmaWVsZCB0aGF0IGlzIG5vIGxvbmdl ciB1c2VkLgorCisgICAgICAgICogd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5jcHA6CisgICAgICAg IChKU0M6Oldhc206OnBhcnNlQW5kQ29tcGlsZSk6CisgICAgICAgICogd2FzbS9XYXNtQjNJUkdl bmVyYXRvci5oOgorICAgICAgICAqIHdhc20vV2FzbUZ1bmN0aW9uUGFyc2VyLmg6CisgICAgICAg IChKU0M6Oldhc206OkZ1bmN0aW9uUGFyc2VyPENvbnRleHQ+OjpGdW5jdGlvblBhcnNlcik6Cisg ICAgICAgICogd2FzbS9XYXNtTW9kdWxlUGFyc2VyLmg6CisgICAgICAgIChKU0M6Oldhc206Ok1v ZHVsZVBhcnNlcjo6TW9kdWxlUGFyc2VyKToKKyAgICAgICAgKiB3YXNtL1dhc21QYXJzZXIuaDoK KyAgICAgICAgKEpTQzo6V2FzbTo6UGFyc2VyPFN1Y2Nlc3NUeXBlPjo6UGFyc2VyKToKKyAgICAg ICAgKiB3YXNtL1dhc21QbGFuLmNwcDoKKyAgICAgICAgKEpTQzo6V2FzbTo6UGxhbjo6cGFyc2VB bmRWYWxpZGF0ZU1vZHVsZSk6CisgICAgICAgIChKU0M6Oldhc206OlBsYW46OmNvbXBpbGVGdW5j dGlvbnMpOgorICAgICAgICAqIHdhc20vV2FzbVZhbGlkYXRlLmNwcDoKKyAgICAgICAgKEpTQzo6 V2FzbTo6dmFsaWRhdGVGdW5jdGlvbik6CisgICAgICAgICogd2FzbS9XYXNtVmFsaWRhdGUuaDoK KwogMjAxNy0wMy0zMSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBXZWJBc3NlbWJseTogUmVmIGNvdW50IFNpZ25hdHVyZSBhbmQgU2lnbmF0dXJlSW5mb3JtYXRp b24gc2hvdWxkIG5vdCBjYXJlIGFib3V0IFZNCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv d2FzbS9XYXNtQjNJUkdlbmVyYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL3dhc20vV2FzbUIzSVJHZW5lcmF0b3IuY3BwCShyZXZpc2lvbiAyMTQ2OTEpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEyNjMsNyArMTI2Myw3IEBAIGF1dG8gQjNJUkdlbmVyYXRvcjo6b3JpZ2luKCkg LT4gT3JpZ2luCiAgICAgcmV0dXJuIGJpdHdpc2VfY2FzdDxPcmlnaW4+KE9wY29kZU9yaWdpbiht X3BhcnNlci0+Y3VycmVudE9wY29kZSgpLCBtX3BhcnNlci0+Y3VycmVudE9wY29kZVN0YXJ0aW5n T2Zmc2V0KCkpKTsKIH0KIAotRXhwZWN0ZWQ8c3RkOjp1bmlxdWVfcHRyPFdhc21JbnRlcm5hbEZ1 bmN0aW9uPiwgU3RyaW5nPiBwYXJzZUFuZENvbXBpbGUoVk0mIHZtLCBDb21waWxhdGlvbkNvbnRl eHQmIGNvbXBpbGF0aW9uQ29udGV4dCwgY29uc3QgdWludDhfdCogZnVuY3Rpb25TdGFydCwgc2l6 ZV90IGZ1bmN0aW9uTGVuZ3RoLCBjb25zdCBTaWduYXR1cmUmIHNpZ25hdHVyZSwgVmVjdG9yPFVu bGlua2VkV2FzbVRvV2FzbUNhbGw+JiB1bmxpbmtlZFdhc21Ub1dhc21DYWxscywgY29uc3QgTW9k dWxlSW5mb3JtYXRpb24mIGluZm8sIGNvbnN0IFZlY3RvcjxTaWduYXR1cmVJbmRleD4mIG1vZHVs ZVNpZ25hdHVyZUluZGljZXNUb1VuaXF1ZWRTaWduYXR1cmVJbmRpY2VzLCBNZW1vcnlNb2RlIG1v ZGUsIHVuc2lnbmVkIG9wdExldmVsKQorRXhwZWN0ZWQ8c3RkOjp1bmlxdWVfcHRyPFdhc21JbnRl cm5hbEZ1bmN0aW9uPiwgU3RyaW5nPiBwYXJzZUFuZENvbXBpbGUoQ29tcGlsYXRpb25Db250ZXh0 JiBjb21waWxhdGlvbkNvbnRleHQsIGNvbnN0IHVpbnQ4X3QqIGZ1bmN0aW9uU3RhcnQsIHNpemVf dCBmdW5jdGlvbkxlbmd0aCwgY29uc3QgU2lnbmF0dXJlJiBzaWduYXR1cmUsIFZlY3RvcjxVbmxp bmtlZFdhc21Ub1dhc21DYWxsPiYgdW5saW5rZWRXYXNtVG9XYXNtQ2FsbHMsIGNvbnN0IE1vZHVs ZUluZm9ybWF0aW9uJiBpbmZvLCBjb25zdCBWZWN0b3I8U2lnbmF0dXJlSW5kZXg+JiBtb2R1bGVT aWduYXR1cmVJbmRpY2VzVG9VbmlxdWVkU2lnbmF0dXJlSW5kaWNlcywgTWVtb3J5TW9kZSBtb2Rl LCB1bnNpZ25lZCBvcHRMZXZlbCkKIHsKICAgICBhdXRvIHJlc3VsdCA9IHN0ZDo6bWFrZV91bmlx dWU8V2FzbUludGVybmFsRnVuY3Rpb24+KCk7CiAKQEAgLTEyNzgsNyArMTI3OCw3IEBAIEV4cGVj dGVkPHN0ZDo6dW5pcXVlX3B0cjxXYXNtSW50ZXJuYWxGdW4KICAgICB9KTsKIAogICAgIEIzSVJH ZW5lcmF0b3IgY29udGV4dChpbmZvLCBwcm9jZWR1cmUsIHJlc3VsdC5nZXQoKSwgdW5saW5rZWRX YXNtVG9XYXNtQ2FsbHMsIG1vZGUpOwotICAgIEZ1bmN0aW9uUGFyc2VyPEIzSVJHZW5lcmF0b3I+ IHBhcnNlcigmdm0sIGNvbnRleHQsIGZ1bmN0aW9uU3RhcnQsIGZ1bmN0aW9uTGVuZ3RoLCBzaWdu YXR1cmUsIGluZm8sIG1vZHVsZVNpZ25hdHVyZUluZGljZXNUb1VuaXF1ZWRTaWduYXR1cmVJbmRp Y2VzKTsKKyAgICBGdW5jdGlvblBhcnNlcjxCM0lSR2VuZXJhdG9yPiBwYXJzZXIoY29udGV4dCwg ZnVuY3Rpb25TdGFydCwgZnVuY3Rpb25MZW5ndGgsIHNpZ25hdHVyZSwgaW5mbywgbW9kdWxlU2ln bmF0dXJlSW5kaWNlc1RvVW5pcXVlZFNpZ25hdHVyZUluZGljZXMpOwogICAgIFdBU01fRkFJTF9J Rl9IRUxQRVJfRkFJTFMocGFyc2VyLnBhcnNlKCkpOwogCiAgICAgY29udGV4dC5pbnNlcnRDb25z dGFudHMoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21CM0lSR2VuZXJh dG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUIzSVJH ZW5lcmF0b3IuaAkocmV2aXNpb24gMjE0NjkxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vV2FzbUIzSVJHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAsNiBAQAog I2luY2x1ZGUgIkIzQ29tbW9uLmgiCiAjaW5jbHVkZSAiQjNDb21waWxhdGlvbi5oIgogI2luY2x1 ZGUgIkNDYWxsSGVscGVycy5oIgotI2luY2x1ZGUgIlZNLmgiCiAjaW5jbHVkZSAiV2FzbUZvcm1h dC5oIgogI2luY2x1ZGUgIldhc21NZW1vcnkuaCIKICNpbmNsdWRlIDx3dGYvRXhwZWN0ZWQuaD4K QEAgLTQ5LDcgKzQ4LDcgQEAgc3RydWN0IENvbXBpbGF0aW9uQ29udGV4dCB7CiAgICAgQ0NhbGxI ZWxwZXJzOjpDYWxsIGpzRW50cnlwb2ludFRvV2FzbUVudHJ5cG9pbnRDYWxsOwogfTsKIAotRXhw ZWN0ZWQ8c3RkOjp1bmlxdWVfcHRyPFdhc21JbnRlcm5hbEZ1bmN0aW9uPiwgU3RyaW5nPiBwYXJz ZUFuZENvbXBpbGUoVk0mLCBDb21waWxhdGlvbkNvbnRleHQmLCBjb25zdCB1aW50OF90Kiwgc2l6 ZV90LCBjb25zdCBTaWduYXR1cmUmLCBWZWN0b3I8VW5saW5rZWRXYXNtVG9XYXNtQ2FsbD4mLCBj b25zdCBNb2R1bGVJbmZvcm1hdGlvbiYsIGNvbnN0IFZlY3RvcjxTaWduYXR1cmVJbmRleD4mLCBN ZW1vcnlNb2RlLCB1bnNpZ25lZCBvcHRMZXZlbCA9IEIzOjpkZWZhdWx0T3B0TGV2ZWwoKSk7CitF eHBlY3RlZDxzdGQ6OnVuaXF1ZV9wdHI8V2FzbUludGVybmFsRnVuY3Rpb24+LCBTdHJpbmc+IHBh cnNlQW5kQ29tcGlsZShDb21waWxhdGlvbkNvbnRleHQmLCBjb25zdCB1aW50OF90Kiwgc2l6ZV90 LCBjb25zdCBTaWduYXR1cmUmLCBWZWN0b3I8VW5saW5rZWRXYXNtVG9XYXNtQ2FsbD4mLCBjb25z dCBNb2R1bGVJbmZvcm1hdGlvbiYsIGNvbnN0IFZlY3RvcjxTaWduYXR1cmVJbmRleD4mLCBNZW1v cnlNb2RlLCB1bnNpZ25lZCBvcHRMZXZlbCA9IEIzOjpkZWZhdWx0T3B0TGV2ZWwoKSk7CiAKIH0g fSAvLyBuYW1lc3BhY2UgSlNDOjpXYXNtCiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL1dhc21GdW5jdGlvblBhcnNlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS93YXNtL1dhc21GdW5jdGlvblBhcnNlci5oCShyZXZpc2lvbiAyMTQ2OTEpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtRnVuY3Rpb25QYXJzZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtNDYsNyArNDYsNyBAQCBwdWJsaWM6CiAgICAgdHlwZWRlZiB0eXBlbmFtZSBDb250ZXh0 OjpDb250cm9sVHlwZSBDb250cm9sVHlwZTsKICAgICB0eXBlZGVmIHR5cGVuYW1lIENvbnRleHQ6 OkV4cHJlc3Npb25MaXN0IEV4cHJlc3Npb25MaXN0OwogCi0gICAgRnVuY3Rpb25QYXJzZXIoVk0q LCBDb250ZXh0JiwgY29uc3QgdWludDhfdCogZnVuY3Rpb25TdGFydCwgc2l6ZV90IGZ1bmN0aW9u TGVuZ3RoLCBjb25zdCBTaWduYXR1cmUmLCBjb25zdCBNb2R1bGVJbmZvcm1hdGlvbiYsIGNvbnN0 IFZlY3RvcjxTaWduYXR1cmVJbmRleD4mKTsKKyAgICBGdW5jdGlvblBhcnNlcihDb250ZXh0Jiwg Y29uc3QgdWludDhfdCogZnVuY3Rpb25TdGFydCwgc2l6ZV90IGZ1bmN0aW9uTGVuZ3RoLCBjb25z dCBTaWduYXR1cmUmLCBjb25zdCBNb2R1bGVJbmZvcm1hdGlvbiYsIGNvbnN0IFZlY3RvcjxTaWdu YXR1cmVJbmRleD4mKTsKIAogICAgIFJlc3VsdCBXQVJOX1VOVVNFRF9SRVRVUk4gcGFyc2UoKTsK IApAQCAtOTUsOCArOTUsOCBAQCBwcml2YXRlOgogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgQ29u dGV4dD4KLUZ1bmN0aW9uUGFyc2VyPENvbnRleHQ+OjpGdW5jdGlvblBhcnNlcihWTSogdm0sIENv bnRleHQmIGNvbnRleHQsIGNvbnN0IHVpbnQ4X3QqIGZ1bmN0aW9uU3RhcnQsIHNpemVfdCBmdW5j dGlvbkxlbmd0aCwgY29uc3QgU2lnbmF0dXJlJiBzaWduYXR1cmUsIGNvbnN0IE1vZHVsZUluZm9y bWF0aW9uJiBpbmZvLCBjb25zdCBWZWN0b3I8U2lnbmF0dXJlSW5kZXg+JiBtb2R1bGVTaWduYXR1 cmVJbmRpY2VzVG9VbmlxdWVkU2lnbmF0dXJlSW5kaWNlcykKLSAgICA6IFBhcnNlcih2bSwgZnVu Y3Rpb25TdGFydCwgZnVuY3Rpb25MZW5ndGgpCitGdW5jdGlvblBhcnNlcjxDb250ZXh0Pjo6RnVu Y3Rpb25QYXJzZXIoQ29udGV4dCYgY29udGV4dCwgY29uc3QgdWludDhfdCogZnVuY3Rpb25TdGFy dCwgc2l6ZV90IGZ1bmN0aW9uTGVuZ3RoLCBjb25zdCBTaWduYXR1cmUmIHNpZ25hdHVyZSwgY29u c3QgTW9kdWxlSW5mb3JtYXRpb24mIGluZm8sIGNvbnN0IFZlY3RvcjxTaWduYXR1cmVJbmRleD4m IG1vZHVsZVNpZ25hdHVyZUluZGljZXNUb1VuaXF1ZWRTaWduYXR1cmVJbmRpY2VzKQorICAgIDog UGFyc2VyKGZ1bmN0aW9uU3RhcnQsIGZ1bmN0aW9uTGVuZ3RoKQogICAgICwgbV9jb250ZXh0KGNv bnRleHQpCiAgICAgLCBtX3NpZ25hdHVyZShzaWduYXR1cmUpCiAgICAgLCBtX2luZm8oaW5mbykK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21Nb2R1bGVQYXJzZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtTW9kdWxlUGFyc2VyLmgJ KHJldmlzaW9uIDIxNDY5MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21Nb2R1 bGVQYXJzZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsOCArNDUsOCBAQCBjbGFzcyBNb2R1bGVQ YXJzZXIgOiBwdWJsaWMgUGFyc2VyPE1vZHVsCiBwdWJsaWM6CiAKIAotICAgIE1vZHVsZVBhcnNl cihWTSogdm0sIGNvbnN0IHVpbnQ4X3QqIHNvdXJjZUJ1ZmZlciwgc2l6ZV90IHNvdXJjZUxlbmd0 aCkKLSAgICAgICAgOiBQYXJzZXIodm0sIHNvdXJjZUJ1ZmZlciwgc291cmNlTGVuZ3RoKQorICAg IE1vZHVsZVBhcnNlcihjb25zdCB1aW50OF90KiBzb3VyY2VCdWZmZXIsIHNpemVfdCBzb3VyY2VM ZW5ndGgpCisgICAgICAgIDogUGFyc2VyKHNvdXJjZUJ1ZmZlciwgc291cmNlTGVuZ3RoKQogICAg IHsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21QYXJzZXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtUGFyc2VyLmgJ KHJldmlzaW9uIDIxNDY5MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21QYXJz ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTYsNyArNTYsNyBAQCBwdWJsaWM6CiAgICAgdHlwZWRl ZiBFeHBlY3RlZDxTdWNjZXNzVHlwZSwgRXJyb3JUeXBlPiBSZXN1bHQ7CiAKIHByb3RlY3RlZDoK LSAgICBQYXJzZXIoVk0qLCBjb25zdCB1aW50OF90Kiwgc2l6ZV90KTsKKyAgICBQYXJzZXIoY29u c3QgdWludDhfdCosIHNpemVfdCk7CiAKICAgICBib29sIFdBUk5fVU5VU0VEX1JFVFVSTiBjb25z dW1lQ2hhcmFjdGVyKGNoYXIpOwogICAgIGJvb2wgV0FSTl9VTlVTRURfUkVUVVJOIGNvbnN1bWVT dHJpbmcoY29uc3QgY2hhciopOwpAQCAtODEsNyArODEsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgY29u c3QgdWludDhfdCogc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2U7IH0KICAgICBzaXpl X3QgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2VMZW5ndGg7IH0KIAotICAgIFZNKiBt X3ZtOwogICAgIHNpemVfdCBtX29mZnNldCA9IDA7CiAKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUg Li4uQXJncz4KQEAgLTEwNyw5ICsxMDYsOCBAQCBwcml2YXRlOgogfTsKIAogdGVtcGxhdGU8dHlw ZW5hbWUgU3VjY2Vzc1R5cGU+Ci1BTFdBWVNfSU5MSU5FIFBhcnNlcjxTdWNjZXNzVHlwZT46OlBh cnNlcihWTSogdm0sIGNvbnN0IHVpbnQ4X3QqIHNvdXJjZUJ1ZmZlciwgc2l6ZV90IHNvdXJjZUxl bmd0aCkKLSAgICA6IG1fdm0odm0pCi0gICAgLCBtX3NvdXJjZShzb3VyY2VCdWZmZXIpCitBTFdB WVNfSU5MSU5FIFBhcnNlcjxTdWNjZXNzVHlwZT46OlBhcnNlcihjb25zdCB1aW50OF90KiBzb3Vy Y2VCdWZmZXIsIHNpemVfdCBzb3VyY2VMZW5ndGgpCisgICAgOiBtX3NvdXJjZShzb3VyY2VCdWZm ZXIpCiAgICAgLCBtX3NvdXJjZUxlbmd0aChzb3VyY2VMZW5ndGgpCiB7CiB9CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtUGxhbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbVBsYW4uY3BwCShyZXZpc2lvbiAyMTQ2OTEpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtUGxhbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEwNCw3ICsxMDQsNyBAQCBib29sIFBsYW46OnBhcnNlQW5kVmFsaWRhdGVNb2R1bGUoKQogICAg ICAgICBzdGFydFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKIAogICAgIHsKLSAgICAgICAg TW9kdWxlUGFyc2VyIG1vZHVsZVBhcnNlcigmbV92bSwgbV9zb3VyY2UsIG1fc291cmNlTGVuZ3Ro KTsKKyAgICAgICAgTW9kdWxlUGFyc2VyIG1vZHVsZVBhcnNlcihtX3NvdXJjZSwgbV9zb3VyY2VM ZW5ndGgpOwogICAgICAgICBhdXRvIHBhcnNlUmVzdWx0ID0gbW9kdWxlUGFyc2VyLnBhcnNlKCk7 CiAgICAgICAgIGlmICghcGFyc2VSZXN1bHQpIHsKICAgICAgICAgICAgIGZhaWwoaG9sZExvY2so bV9sb2NrKSwgV1RGTW92ZShwYXJzZVJlc3VsdC5lcnJvcigpKSk7CkBAIC0xMjMsNyArMTIzLDcg QEAgYm9vbCBQbGFuOjpwYXJzZUFuZFZhbGlkYXRlTW9kdWxlKCkKICAgICAgICAgU2lnbmF0dXJl SW5kZXggc2lnbmF0dXJlSW5kZXggPSBtX21vZHVsZUluZm9ybWF0aW9uLT5pbnRlcm5hbEZ1bmN0 aW9uU2lnbmF0dXJlSW5kaWNlc1tmdW5jdGlvbkluZGV4XTsKICAgICAgICAgY29uc3QgU2lnbmF0 dXJlJiBzaWduYXR1cmUgPSBTaWduYXR1cmVJbmZvcm1hdGlvbjo6Z2V0KHNpZ25hdHVyZUluZGV4 KTsKIAotICAgICAgICBhdXRvIHZhbGlkYXRpb25SZXN1bHQgPSB2YWxpZGF0ZUZ1bmN0aW9uKCZt X3ZtLCBmdW5jdGlvblN0YXJ0LCBmdW5jdGlvbkxlbmd0aCwgc2lnbmF0dXJlLCAqbV9tb2R1bGVJ bmZvcm1hdGlvbiwgbV9tb2R1bGVTaWduYXR1cmVJbmRpY2VzVG9VbmlxdWVkU2lnbmF0dXJlSW5k aWNlcyk7CisgICAgICAgIGF1dG8gdmFsaWRhdGlvblJlc3VsdCA9IHZhbGlkYXRlRnVuY3Rpb24o ZnVuY3Rpb25TdGFydCwgZnVuY3Rpb25MZW5ndGgsIHNpZ25hdHVyZSwgKm1fbW9kdWxlSW5mb3Jt YXRpb24sIG1fbW9kdWxlU2lnbmF0dXJlSW5kaWNlc1RvVW5pcXVlZFNpZ25hdHVyZUluZGljZXMp OwogICAgICAgICBpZiAoIXZhbGlkYXRpb25SZXN1bHQpIHsKICAgICAgICAgICAgIGlmICh2ZXJi b3NlKSB7CiAgICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGZ1bmN0aW9u TGVuZ3RoOyArK2kpCkBAIC0yNDIsMTAgKzI0MiwxMCBAQCB2b2lkIFBsYW46OmNvbXBpbGVGdW5j dGlvbnMoQ29tcGlsYXRpb25FCiAgICAgICAgIGNvbnN0IFNpZ25hdHVyZSYgc2lnbmF0dXJlID0g U2lnbmF0dXJlSW5mb3JtYXRpb246OmdldChzaWduYXR1cmVJbmRleCk7CiAgICAgICAgIHVuc2ln bmVkIGZ1bmN0aW9uSW5kZXhTcGFjZSA9IG1fd2FzbUV4aXRTdHVicy5zaXplKCkgKyBmdW5jdGlv bkluZGV4OwogICAgICAgICBBU1NFUlRfVU5VU0VEKGZ1bmN0aW9uSW5kZXhTcGFjZSwgbV9tb2R1 bGVJbmZvcm1hdGlvbi0+c2lnbmF0dXJlSW5kZXhGcm9tRnVuY3Rpb25JbmRleFNwYWNlKGZ1bmN0 aW9uSW5kZXhTcGFjZSkgPT0gc2lnbmF0dXJlSW5kZXgpOwotICAgICAgICBBU1NFUlQodmFsaWRh dGVGdW5jdGlvbigmbV92bSwgZnVuY3Rpb25TdGFydCwgZnVuY3Rpb25MZW5ndGgsIHNpZ25hdHVy ZSwgKm1fbW9kdWxlSW5mb3JtYXRpb24sIG1fbW9kdWxlU2lnbmF0dXJlSW5kaWNlc1RvVW5pcXVl ZFNpZ25hdHVyZUluZGljZXMpKTsKKyAgICAgICAgQVNTRVJUKHZhbGlkYXRlRnVuY3Rpb24oZnVu Y3Rpb25TdGFydCwgZnVuY3Rpb25MZW5ndGgsIHNpZ25hdHVyZSwgKm1fbW9kdWxlSW5mb3JtYXRp b24sIG1fbW9kdWxlU2lnbmF0dXJlSW5kaWNlc1RvVW5pcXVlZFNpZ25hdHVyZUluZGljZXMpKTsK IAogICAgICAgICBtX3VubGlua2VkV2FzbVRvV2FzbUNhbGxzW2Z1bmN0aW9uSW5kZXhdID0gVmVj dG9yPFVubGlua2VkV2FzbVRvV2FzbUNhbGw+KCk7Ci0gICAgICAgIGF1dG8gcGFyc2VBbmRDb21w aWxlUmVzdWx0ID0gcGFyc2VBbmRDb21waWxlKG1fdm0sIG1fY29tcGlsYXRpb25Db250ZXh0c1tm dW5jdGlvbkluZGV4XSwgZnVuY3Rpb25TdGFydCwgZnVuY3Rpb25MZW5ndGgsIHNpZ25hdHVyZSwg bV91bmxpbmtlZFdhc21Ub1dhc21DYWxsc1tmdW5jdGlvbkluZGV4XSwgKm1fbW9kdWxlSW5mb3Jt YXRpb24sIG1fbW9kdWxlU2lnbmF0dXJlSW5kaWNlc1RvVW5pcXVlZFNpZ25hdHVyZUluZGljZXMs IG1fbW9kZSk7CisgICAgICAgIGF1dG8gcGFyc2VBbmRDb21waWxlUmVzdWx0ID0gcGFyc2VBbmRD b21waWxlKG1fY29tcGlsYXRpb25Db250ZXh0c1tmdW5jdGlvbkluZGV4XSwgZnVuY3Rpb25TdGFy dCwgZnVuY3Rpb25MZW5ndGgsIHNpZ25hdHVyZSwgbV91bmxpbmtlZFdhc21Ub1dhc21DYWxsc1tm dW5jdGlvbkluZGV4XSwgKm1fbW9kdWxlSW5mb3JtYXRpb24sIG1fbW9kdWxlU2lnbmF0dXJlSW5k aWNlc1RvVW5pcXVlZFNpZ25hdHVyZUluZGljZXMsIG1fbW9kZSk7CiAKICAgICAgICAgaWYgKFVO TElLRUxZKCFwYXJzZUFuZENvbXBpbGVSZXN1bHQpKSB7CiAgICAgICAgICAgICBhdXRvIGxvY2tl ciA9IGhvbGRMb2NrKG1fbG9jayk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9X YXNtVmFsaWRhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L1dhc21WYWxpZGF0ZS5jcHAJKHJldmlzaW9uIDIxNDY5MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS93YXNtL1dhc21WYWxpZGF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4MiwxMCArMzgy LDEwIEBAIHZvaWQgVmFsaWRhdGU6OmR1bXAoY29uc3QgVmVjdG9yPENvbnRyb2wKICAgICBkYXRh TG9nTG4oKTsKIH0KIAotRXhwZWN0ZWQ8dm9pZCwgU3RyaW5nPiB2YWxpZGF0ZUZ1bmN0aW9uKFZN KiB2bSwgY29uc3QgdWludDhfdCogc291cmNlLCBzaXplX3QgbGVuZ3RoLCBjb25zdCBTaWduYXR1 cmUmIHNpZ25hdHVyZSwgY29uc3QgTW9kdWxlSW5mb3JtYXRpb24mIG1vZHVsZSwgY29uc3QgVmVj dG9yPFNpZ25hdHVyZUluZGV4PiYgbW9kdWxlU2lnbmF0dXJlSW5kaWNlc1RvVW5pcXVlZFNpZ25h dHVyZUluZGljZXMpCitFeHBlY3RlZDx2b2lkLCBTdHJpbmc+IHZhbGlkYXRlRnVuY3Rpb24oY29u c3QgdWludDhfdCogc291cmNlLCBzaXplX3QgbGVuZ3RoLCBjb25zdCBTaWduYXR1cmUmIHNpZ25h dHVyZSwgY29uc3QgTW9kdWxlSW5mb3JtYXRpb24mIG1vZHVsZSwgY29uc3QgVmVjdG9yPFNpZ25h dHVyZUluZGV4PiYgbW9kdWxlU2lnbmF0dXJlSW5kaWNlc1RvVW5pcXVlZFNpZ25hdHVyZUluZGlj ZXMpCiB7CiAgICAgVmFsaWRhdGUgY29udGV4dChtb2R1bGUpOwotICAgIEZ1bmN0aW9uUGFyc2Vy PFZhbGlkYXRlPiB2YWxpZGF0b3Iodm0sIGNvbnRleHQsIHNvdXJjZSwgbGVuZ3RoLCBzaWduYXR1 cmUsIG1vZHVsZSwgbW9kdWxlU2lnbmF0dXJlSW5kaWNlc1RvVW5pcXVlZFNpZ25hdHVyZUluZGlj ZXMpOworICAgIEZ1bmN0aW9uUGFyc2VyPFZhbGlkYXRlPiB2YWxpZGF0b3IoY29udGV4dCwgc291 cmNlLCBsZW5ndGgsIHNpZ25hdHVyZSwgbW9kdWxlLCBtb2R1bGVTaWduYXR1cmVJbmRpY2VzVG9V bmlxdWVkU2lnbmF0dXJlSW5kaWNlcyk7CiAgICAgV0FTTV9GQUlMX0lGX0hFTFBFUl9GQUlMUyh2 YWxpZGF0b3IucGFyc2UoKSk7CiAgICAgcmV0dXJuIHsgfTsKIH0KSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL1dhc21WYWxpZGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS93YXNtL1dhc21WYWxpZGF0ZS5oCShyZXZpc2lvbiAyMTQ2OTEpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtVmFsaWRhdGUuaAkod29ya2luZyBjb3B5KQpAQCAt MzIsMTEgKzMyLDkgQEAKIAogbmFtZXNwYWNlIEpTQyB7CiAKLWNsYXNzIFZNOwotCiBuYW1lc3Bh Y2UgV2FzbSB7CiAKLUV4cGVjdGVkPHZvaWQsIFN0cmluZz4gdmFsaWRhdGVGdW5jdGlvbihWTSos IGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QsIGNvbnN0IFNpZ25hdHVyZSYsIGNvbnN0IE1vZHVsZUlu Zm9ybWF0aW9uJiwgY29uc3QgVmVjdG9yPFNpZ25hdHVyZUluZGV4PiYpOworRXhwZWN0ZWQ8dm9p ZCwgU3RyaW5nPiB2YWxpZGF0ZUZ1bmN0aW9uKGNvbnN0IHVpbnQ4X3QqLCBzaXplX3QsIGNvbnN0 IFNpZ25hdHVyZSYsIGNvbnN0IE1vZHVsZUluZm9ybWF0aW9uJiwgY29uc3QgVmVjdG9yPFNpZ25h dHVyZUluZGV4PiYpOwogCiB9IH0gLy8gbmFtZXNwYWNlIEpTQzo6V2FzbQogCg==