165966 2016-12-16 11:58:46 -0800 Add missing cases to parseUnreachableExpression and cleanup FunctionParser 2016-12-16 13:37:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 keith_miller keith_miller commit-queue mark.lam msaboff saam oldest_to_newest 1260687 0 keith_miller 2016-12-16 11:58:46 -0800 Add missing cases to parseUnreachableExpression and cleanup FunctionParser 1260702 1 297342 keith_miller 2016-12-16 12:30:28 -0800 Created attachment 297342 Patch 1260705 2 commit-queue 2016-12-16 12:32:12 -0800 Attachment 297342 did not pass style-queue: ERROR: Source/JavaScriptCore/wasm/WasmFunctionParser.h:204: Non-label code inside switch statements should be indented. [whitespace/indent] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1260729 3 297342 saam 2016-12-16 13:35:14 -0800 Comment on attachment 297342 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=297342&action=review > Source/JavaScriptCore/wasm/WasmFunctionParser.h:498 > +// FIXME: We should try to use the same decoder function for both unreachable and reachable code. https://bugs.webkit.org/show_bug.cgi?id=165965 Yeah :( 1260731 4 keith_miller 2016-12-16 13:37:19 -0800 Committed r209934: <http://trac.webkit.org/changeset/209934> 297342 2016-12-16 12:30:28 -0800 2016-12-16 13:35:14 -0800 Patch bug-165966-20161216122933.patch text/plain 15017 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 YTczYTM3YzhmYTMzY2I0MTViMDBkNmUyMDZkZWI1YWY4MDE2YmQ0Li4yMGM0ODVkNjM3Y2RhNTdh MGQwNGQyMzZlNWEyZjYyNWY3MGVlNzNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOSBAQAogMjAxNi0xMi0xNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KIAorICAgICAgICBBZGQgbWlzc2luZyBjYXNlcyB0byBwYXJzZVVucmVhY2hhYmxlRXhw cmVzc2lvbiBhbmQgY2xlYW51cCBGdW5jdGlvblBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1OTY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGEgbnVtYmVyIG9mIG1p c3NpbmcgY2FzZXMgdG8gdGhlIFdhc20gRnVuY3Rpb25QYXJzZXIncyB1bnJlYWNoYWJsZQorICAg ICAgICBjb2RlIGRlY29kZXIuIEl0IGFsc28sIHJlbW92ZXMgdW5uZWVkZWQgT3BUeXBlIG5hbWVz cGFjZXMgd2hlcmUgdGhleSB3ZXJlIG5vdAorICAgICAgICBuZWVkZWQgYW5kIGhhcyB0aGUgdW5h cnkgLyBiaW5hcnkgbWFjcm9zIGNvdmVyIGFsbCB0aGUgY2FzZXMgcmF0aGVyIHRoYW4KKyAgICAg ICAganVzdCB0aGUgc2ltcGxlIGNhc2VzLgorCisgICAgICAgICogd2FzbS9XYXNtRnVuY3Rpb25Q YXJzZXIuaDoKKworMjAxNi0xMi0xNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKwogICAgICAgICBpNjQuZXF6IHNob3VsZCB1c2UgYW4gSW50NjQgemVybwogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1OTQyCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21GdW5jdGlvblBhcnNlci5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUZ1bmN0aW9uUGFyc2VyLmgKaW5kZXggNzMx ZWE2YjliMmFhZGViNWNhNmI2ZmM0MjZlNTM1ZjIwYjNiOWI1MC4uOGRkMjgyZGM3MGJhNTE1YzQ5 OTZhZTViMDJjZGMyN2NhNWNhNGNmNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3dhc20vV2FzbUZ1bmN0aW9uUGFyc2VyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dh c20vV2FzbUZ1bmN0aW9uUGFyc2VyLmgKQEAgLTEzNiw3ICsxMzYsNyBAQCBhdXRvIEZ1bmN0aW9u UGFyc2VyPENvbnRleHQ+OjpwYXJzZUJvZHkoKSAtPiBQYXJ0aWFsUmVzdWx0CiAgICAgICAgICAg ICBtX2NvbnRleHQuZHVtcChtX2NvbnRyb2xTdGFjaywgbV9leHByZXNzaW9uU3RhY2spOwogICAg ICAgICB9CiAKLSAgICAgICAgaWYgKG9wID09IE9wVHlwZTo6RW5kICYmICFtX2NvbnRyb2xTdGFj ay5zaXplKCkpIHsKKyAgICAgICAgaWYgKG9wID09IEVuZCAmJiAhbV9jb250cm9sU3RhY2suc2l6 ZSgpKSB7CiAgICAgICAgICAgICBpZiAobV91bnJlYWNoYWJsZUJsb2NrcykKICAgICAgICAgICAg ICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAgcmV0dXJuIGFkZFJldHVybigpOwpAQCAtMjAx LDMyICsyMDEsMTQgQEAgYXV0byBGdW5jdGlvblBhcnNlcjxDb250ZXh0Pjo6cGFyc2VFeHByZXNz aW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJlc3VsdAogewogICAgIHN3aXRjaCAob3ApIHsKICNk ZWZpbmUgQ1JFQVRFX0NBU0UobmFtZSwgaWQsIGIzb3AsIGluYykgY2FzZSBPcFR5cGU6Om5hbWU6 IHJldHVybiBiaW5hcnlDYXNlPE9wVHlwZTo6bmFtZT4oKTsKLSAgICBGT1JfRUFDSF9XQVNNX1NJ TVBMRV9CSU5BUllfT1AoQ1JFQVRFX0NBU0UpCisgICAgRk9SX0VBQ0hfV0FTTV9CSU5BUllfT1Ao Q1JFQVRFX0NBU0UpCiAjdW5kZWYgQ1JFQVRFX0NBU0UKIAotICAgIGNhc2UgT3BUeXBlOjpGMzJD b252ZXJ0VUk2NDogcmV0dXJuIHVuYXJ5Q2FzZTxPcFR5cGU6OkYzMkNvbnZlcnRVSTY0PigpOwot ICAgIGNhc2UgT3BUeXBlOjpGNjRDb252ZXJ0VUk2NDogcmV0dXJuIHVuYXJ5Q2FzZTxPcFR5cGU6 OkY2NENvbnZlcnRVSTY0PigpOwotICAgIGNhc2UgT3BUeXBlOjpGMzJOZWFyZXN0OiByZXR1cm4g dW5hcnlDYXNlPE9wVHlwZTo6RjMyTmVhcmVzdD4oKTsKLSAgICBjYXNlIE9wVHlwZTo6RjY0TmVh cmVzdDogcmV0dXJuIHVuYXJ5Q2FzZTxPcFR5cGU6OkY2NE5lYXJlc3Q+KCk7Ci0gICAgY2FzZSBP cFR5cGU6OkYzMlRydW5jOiByZXR1cm4gdW5hcnlDYXNlPE9wVHlwZTo6RjMyVHJ1bmM+KCk7Ci0g ICAgY2FzZSBPcFR5cGU6OkY2NFRydW5jOiByZXR1cm4gdW5hcnlDYXNlPE9wVHlwZTo6RjY0VHJ1 bmM+KCk7Ci0gICAgY2FzZSBPcFR5cGU6OkkzMkN0ejogcmV0dXJuIHVuYXJ5Q2FzZTxPcFR5cGU6 OkkzMkN0ej4oKTsKLSAgICBjYXNlIE9wVHlwZTo6STY0Q3R6OiByZXR1cm4gdW5hcnlDYXNlPE9w VHlwZTo6STY0Q3R6PigpOwotICAgIGNhc2UgT3BUeXBlOjpJMzJQb3BjbnQ6IHJldHVybiB1bmFy eUNhc2U8T3BUeXBlOjpJMzJQb3BjbnQ+KCk7Ci0gICAgY2FzZSBPcFR5cGU6Okk2NFBvcGNudDog cmV0dXJuIHVuYXJ5Q2FzZTxPcFR5cGU6Okk2NFBvcGNudD4oKTsKLSAgICBjYXNlIE9wVHlwZTo6 STMyVHJ1bmNTRjMyOiByZXR1cm4gdW5hcnlDYXNlPE9wVHlwZTo6STMyVHJ1bmNTRjMyPigpOwot ICAgIGNhc2UgT3BUeXBlOjpJMzJUcnVuY1VGMzI6IHJldHVybiB1bmFyeUNhc2U8T3BUeXBlOjpJ MzJUcnVuY1VGMzI+KCk7Ci0gICAgY2FzZSBPcFR5cGU6OkkzMlRydW5jU0Y2NDogcmV0dXJuIHVu YXJ5Q2FzZTxPcFR5cGU6OkkzMlRydW5jU0Y2ND4oKTsKLSAgICBjYXNlIE9wVHlwZTo6STMyVHJ1 bmNVRjY0OiByZXR1cm4gdW5hcnlDYXNlPE9wVHlwZTo6STMyVHJ1bmNVRjY0PigpOwotICAgIGNh c2UgT3BUeXBlOjpJNjRUcnVuY1NGMzI6IHJldHVybiB1bmFyeUNhc2U8T3BUeXBlOjpJNjRUcnVu Y1NGMzI+KCk7Ci0gICAgY2FzZSBPcFR5cGU6Okk2NFRydW5jVUYzMjogcmV0dXJuIHVuYXJ5Q2Fz ZTxPcFR5cGU6Okk2NFRydW5jVUYzMj4oKTsKLSAgICBjYXNlIE9wVHlwZTo6STY0VHJ1bmNTRjY0 OiByZXR1cm4gdW5hcnlDYXNlPE9wVHlwZTo6STY0VHJ1bmNTRjY0PigpOwotICAgIGNhc2UgT3BU eXBlOjpJNjRUcnVuY1VGNjQ6IHJldHVybiB1bmFyeUNhc2U8T3BUeXBlOjpJNjRUcnVuY1VGNjQ+ KCk7CiAjZGVmaW5lIENSRUFURV9DQVNFKG5hbWUsIGlkLCBiM29wLCBpbmMpIGNhc2UgT3BUeXBl OjpuYW1lOiByZXR1cm4gdW5hcnlDYXNlPE9wVHlwZTo6bmFtZT4oKTsKLSAgICBGT1JfRUFDSF9X QVNNX1NJTVBMRV9VTkFSWV9PUChDUkVBVEVfQ0FTRSkKKyAgICBGT1JfRUFDSF9XQVNNX1VOQVJZ X09QKENSRUFURV9DQVNFKQogI3VuZGVmIENSRUFURV9DQVNFCiAKLSAgICBjYXNlIE9wVHlwZTo6 U2VsZWN0OiB7CisgICAgY2FzZSBTZWxlY3Q6IHsKICAgICAgICAgRXhwcmVzc2lvblR5cGUgY29u ZGl0aW9uOwogICAgICAgICBFeHByZXNzaW9uVHlwZSB6ZXJvOwogICAgICAgICBFeHByZXNzaW9u VHlwZSBub25aZXJvOwpAQCAtMjcwLDM1ICsyNTIsMzUgQEAgYXV0byBGdW5jdGlvblBhcnNlcjxD b250ZXh0Pjo6cGFyc2VFeHByZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJlc3VsdAogICAg IH0KICN1bmRlZiBDUkVBVEVfQ0FTRQogCi0gICAgY2FzZSBPcFR5cGU6OkYzMkNvbnN0OiB7Cisg ICAgY2FzZSBGMzJDb25zdDogewogICAgICAgICB1aW50MzJfdCBjb25zdGFudDsKICAgICAgICAg V0FTTV9QQVJTRVJfRkFJTF9JRighcGFyc2VVSW50MzIoY29uc3RhbnQpLCAiY2FuJ3QgcGFyc2Ug MzItYml0IGZsb2F0aW5nLXBvaW50IGNvbnN0YW50Iik7CiAgICAgICAgIG1fZXhwcmVzc2lvblN0 YWNrLmFwcGVuZChtX2NvbnRleHQuYWRkQ29uc3RhbnQoRjMyLCBjb25zdGFudCkpOwogICAgICAg ICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIGNhc2UgT3BUeXBlOjpJMzJDb25zdDogeworICAg IGNhc2UgSTMyQ29uc3Q6IHsKICAgICAgICAgaW50MzJfdCBjb25zdGFudDsKICAgICAgICAgV0FT TV9QQVJTRVJfRkFJTF9JRighcGFyc2VWYXJJbnQzMihjb25zdGFudCksICJjYW4ndCBwYXJzZSAz Mi1iaXQgY29uc3RhbnQiKTsKICAgICAgICAgbV9leHByZXNzaW9uU3RhY2suYXBwZW5kKG1fY29u dGV4dC5hZGRDb25zdGFudChJMzIsIGNvbnN0YW50KSk7CiAgICAgICAgIHJldHVybiB7IH07CiAg ICAgfQogCi0gICAgY2FzZSBPcFR5cGU6OkY2NENvbnN0OiB7CisgICAgY2FzZSBGNjRDb25zdDog ewogICAgICAgICB1aW50NjRfdCBjb25zdGFudDsKICAgICAgICAgV0FTTV9QQVJTRVJfRkFJTF9J RighcGFyc2VVSW50NjQoY29uc3RhbnQpLCAiY2FuJ3QgcGFyc2UgNjQtYml0IGZsb2F0aW5nLXBv aW50IGNvbnN0YW50Iik7CiAgICAgICAgIG1fZXhwcmVzc2lvblN0YWNrLmFwcGVuZChtX2NvbnRl eHQuYWRkQ29uc3RhbnQoRjY0LCBjb25zdGFudCkpOwogICAgICAgICByZXR1cm4geyB9OwogICAg IH0KIAotICAgIGNhc2UgT3BUeXBlOjpJNjRDb25zdDogeworICAgIGNhc2UgSTY0Q29uc3Q6IHsK ICAgICAgICAgaW50NjRfdCBjb25zdGFudDsKICAgICAgICAgV0FTTV9QQVJTRVJfRkFJTF9JRigh cGFyc2VWYXJJbnQ2NChjb25zdGFudCksICJjYW4ndCBwYXJzZSA2NC1iaXQgY29uc3RhbnQiKTsK ICAgICAgICAgbV9leHByZXNzaW9uU3RhY2suYXBwZW5kKG1fY29udGV4dC5hZGRDb25zdGFudChJ NjQsIGNvbnN0YW50KSk7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCi0gICAgY2FzZSBP cFR5cGU6OkdldExvY2FsOiB7CisgICAgY2FzZSBHZXRMb2NhbDogewogICAgICAgICB1aW50MzJf dCBpbmRleDsKICAgICAgICAgRXhwcmVzc2lvblR5cGUgcmVzdWx0OwogICAgICAgICBXQVNNX1BB UlNFUl9GQUlMX0lGKCFwYXJzZVZhclVJbnQzMihpbmRleCksICJjYW4ndCBnZXQgaW5kZXggZm9y IGdldF9sb2NhbCIpOwpAQCAtMzA3LDcgKzI4OSw3IEBAIGF1dG8gRnVuY3Rpb25QYXJzZXI8Q29u dGV4dD46OnBhcnNlRXhwcmVzc2lvbihPcFR5cGUgb3ApIC0+IFBhcnRpYWxSZXN1bHQKICAgICAg ICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBjYXNlIE9wVHlwZTo6U2V0TG9jYWw6IHsKKyAg ICBjYXNlIFNldExvY2FsOiB7CiAgICAgICAgIHVpbnQzMl90IGluZGV4OwogICAgICAgICBFeHBy ZXNzaW9uVHlwZSB2YWx1ZTsKICAgICAgICAgV0FTTV9QQVJTRVJfRkFJTF9JRighcGFyc2VWYXJV SW50MzIoaW5kZXgpLCAiY2FuJ3QgZ2V0IGluZGV4IGZvciBzZXRfbG9jYWwiKTsKQEAgLTMxNiw3 ICsyOTgsNyBAQCBhdXRvIEZ1bmN0aW9uUGFyc2VyPENvbnRleHQ+OjpwYXJzZUV4cHJlc3Npb24o T3BUeXBlIG9wKSAtPiBQYXJ0aWFsUmVzdWx0CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQog Ci0gICAgY2FzZSBPcFR5cGU6OlRlZUxvY2FsOiB7CisgICAgY2FzZSBUZWVMb2NhbDogewogICAg ICAgICB1aW50MzJfdCBpbmRleDsKICAgICAgICAgV0FTTV9QQVJTRVJfRkFJTF9JRighcGFyc2VW YXJVSW50MzIoaW5kZXgpLCAiY2FuJ3QgZ2V0IGluZGV4IGZvciB0ZWVfbG9jYWwiKTsKICAgICAg ICAgV0FTTV9QQVJTRVJfRkFJTF9JRihtX2V4cHJlc3Npb25TdGFjay5pc0VtcHR5KCksICJjYW4n dCB0ZWVfbG9jYWwgb24gZW1wdHkgZXhwcmVzc2lvbiBzdGFjayIpOwpAQCAtMzI0LDcgKzMwNiw3 IEBAIGF1dG8gRnVuY3Rpb25QYXJzZXI8Q29udGV4dD46OnBhcnNlRXhwcmVzc2lvbihPcFR5cGUg b3ApIC0+IFBhcnRpYWxSZXN1bHQKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBj YXNlIE9wVHlwZTo6R2V0R2xvYmFsOiB7CisgICAgY2FzZSBHZXRHbG9iYWw6IHsKICAgICAgICAg dWludDMyX3QgaW5kZXg7CiAgICAgICAgIEV4cHJlc3Npb25UeXBlIHJlc3VsdDsKICAgICAgICAg V0FTTV9QQVJTRVJfRkFJTF9JRighcGFyc2VWYXJVSW50MzIoaW5kZXgpLCAiY2FuJ3QgZ2V0IGdl dF9nbG9iYWwncyBpbmRleCIpOwpAQCAtMzMzLDcgKzMxNSw3IEBAIGF1dG8gRnVuY3Rpb25QYXJz ZXI8Q29udGV4dD46OnBhcnNlRXhwcmVzc2lvbihPcFR5cGUgb3ApIC0+IFBhcnRpYWxSZXN1bHQK ICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBjYXNlIE9wVHlwZTo6U2V0R2xvYmFs OiB7CisgICAgY2FzZSBTZXRHbG9iYWw6IHsKICAgICAgICAgdWludDMyX3QgaW5kZXg7CiAgICAg ICAgIEV4cHJlc3Npb25UeXBlIHZhbHVlOwogICAgICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFw YXJzZVZhclVJbnQzMihpbmRleCksICJjYW4ndCBnZXQgc2V0X2dsb2JhbCdzIGluZGV4Iik7CkBA IC0zNDIsNyArMzI0LDcgQEAgYXV0byBGdW5jdGlvblBhcnNlcjxDb250ZXh0Pjo6cGFyc2VFeHBy ZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJlc3VsdAogICAgICAgICByZXR1cm4gbV9jb250 ZXh0LnNldEdsb2JhbChpbmRleCwgdmFsdWUpOwogICAgIH0KIAotICAgIGNhc2UgT3BUeXBlOjpD YWxsOiB7CisgICAgY2FzZSBDYWxsOiB7CiAgICAgICAgIHVpbnQzMl90IGZ1bmN0aW9uSW5kZXg7 CiAgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYoIXBhcnNlVmFyVUludDMyKGZ1bmN0aW9uSW5k ZXgpLCAiY2FuJ3QgcGFyc2UgY2FsbCdzIGZ1bmN0aW9uIGluZGV4Iik7CiAgICAgICAgIFdBU01f UEFSU0VSX0ZBSUxfSUYoZnVuY3Rpb25JbmRleCA+PSBtX2Z1bmN0aW9uSW5kZXhTcGFjZS5zaXpl LCAiY2FsbCBmdW5jdGlvbiBpbmRleCAiLCBmdW5jdGlvbkluZGV4LCAiIGV4Y2VlZHMgZnVuY3Rp b24gaW5kZXggc3BhY2UgIiwgbV9mdW5jdGlvbkluZGV4U3BhY2Uuc2l6ZSk7CkBAIC0zNjYsNyAr MzQ4LDcgQEAgYXV0byBGdW5jdGlvblBhcnNlcjxDb250ZXh0Pjo6cGFyc2VFeHByZXNzaW9uKE9w VHlwZSBvcCkgLT4gUGFydGlhbFJlc3VsdAogICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9 CiAKLSAgICBjYXNlIE9wVHlwZTo6Q2FsbEluZGlyZWN0OiB7CisgICAgY2FzZSBDYWxsSW5kaXJl Y3Q6IHsKICAgICAgICAgdWludDMyX3Qgc2lnbmF0dXJlSW5kZXg7CiAgICAgICAgIHVpbnQ4X3Qg cmVzZXJ2ZWQ7CiAgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYoIW1faW5mby50YWJsZUluZm9y bWF0aW9uLCAiY2FsbF9pbmRpcmVjdCBpcyBvbmx5IHZhbGlkIHdoZW4gYSB0YWJsZSBpcyBkZWZp bmVkIG9yIGltcG9ydGVkIik7CkBAIC0zOTUsNyArMzc3LDcgQEAgYXV0byBGdW5jdGlvblBhcnNl cjxDb250ZXh0Pjo6cGFyc2VFeHByZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJlc3VsdAog ICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIGNhc2UgT3BUeXBlOjpCbG9jazogewor ICAgIGNhc2UgQmxvY2s6IHsKICAgICAgICAgVHlwZSBpbmxpbmVTaWduYXR1cmU7CiAgICAgICAg IFdBU01fUEFSU0VSX0ZBSUxfSUYoIXBhcnNlUmVzdWx0VHlwZShpbmxpbmVTaWduYXR1cmUpLCAi Y2FuJ3QgZ2V0IGJsb2NrJ3MgaW5saW5lIHNpZ25hdHVyZSIpOwogICAgICAgICBtX2NvbnRyb2xT dGFjay5hcHBlbmQoeyBXVEZNb3ZlKG1fZXhwcmVzc2lvblN0YWNrKSwgbV9jb250ZXh0LmFkZEJs b2NrKGlubGluZVNpZ25hdHVyZSkgfSk7CkBAIC00MDMsNyArMzg1LDcgQEAgYXV0byBGdW5jdGlv blBhcnNlcjxDb250ZXh0Pjo6cGFyc2VFeHByZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJl c3VsdAogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIGNhc2UgT3BUeXBlOjpMb29w OiB7CisgICAgY2FzZSBMb29wOiB7CiAgICAgICAgIFR5cGUgaW5saW5lU2lnbmF0dXJlOwogICAg ICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFwYXJzZVJlc3VsdFR5cGUoaW5saW5lU2lnbmF0dXJl KSwgImNhbid0IGdldCBsb29wJ3MgaW5saW5lIHNpZ25hdHVyZSIpOwogICAgICAgICBtX2NvbnRy b2xTdGFjay5hcHBlbmQoeyBXVEZNb3ZlKG1fZXhwcmVzc2lvblN0YWNrKSwgbV9jb250ZXh0LmFk ZExvb3AoaW5saW5lU2lnbmF0dXJlKSB9KTsKQEAgLTQxMSw3ICszOTMsNyBAQCBhdXRvIEZ1bmN0 aW9uUGFyc2VyPENvbnRleHQ+OjpwYXJzZUV4cHJlc3Npb24oT3BUeXBlIG9wKSAtPiBQYXJ0aWFs UmVzdWx0CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCi0gICAgY2FzZSBPcFR5cGU6Oklm OiB7CisgICAgY2FzZSBJZjogewogICAgICAgICBUeXBlIGlubGluZVNpZ25hdHVyZTsKICAgICAg ICAgRXhwcmVzc2lvblR5cGUgY29uZGl0aW9uOwogICAgICAgICBDb250cm9sVHlwZSBjb250cm9s OwpAQCAtNDIzLDIwICs0MDUsMjAgQEAgYXV0byBGdW5jdGlvblBhcnNlcjxDb250ZXh0Pjo6cGFy c2VFeHByZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJlc3VsdAogICAgICAgICByZXR1cm4g eyB9OwogICAgIH0KIAotICAgIGNhc2UgT3BUeXBlOjpFbHNlOiB7CisgICAgY2FzZSBFbHNlOiB7 CiAgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYobV9jb250cm9sU3RhY2suaXNFbXB0eSgpLCAi Y2FuJ3QgdXNlIGVsc2UgYmxvY2sgYXQgdGhlIHRvcC1sZXZlbCBvZiBhIGZ1bmN0aW9uIik7CiAg ICAgICAgIFdBU01fVFJZX0FERF9UT19DT05URVhUKGFkZEVsc2UobV9jb250cm9sU3RhY2subGFz dCgpLmNvbnRyb2xEYXRhLCBtX2V4cHJlc3Npb25TdGFjaykpOwogICAgICAgICBtX2V4cHJlc3Np b25TdGFjay5zaHJpbmsoMCk7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCi0gICAgY2Fz ZSBPcFR5cGU6OkJyOgotICAgIGNhc2UgT3BUeXBlOjpCcklmOiB7CisgICAgY2FzZSBCcjoKKyAg ICBjYXNlIEJySWY6IHsKICAgICAgICAgdWludDMyX3QgdGFyZ2V0OwogICAgICAgICBFeHByZXNz aW9uVHlwZSBjb25kaXRpb24gPSBDb250ZXh0OjplbXB0eUV4cHJlc3Npb247CiAgICAgICAgIFdB U01fUEFSU0VSX0ZBSUxfSUYoIXBhcnNlVmFyVUludDMyKHRhcmdldCksICJjYW4ndCBnZXQgYnIg LyBicl9pZidzIHRhcmdldCIpOwogICAgICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKHRhcmdldCA+ PSBtX2NvbnRyb2xTdGFjay5zaXplKCksICJiciAvIGJyX2lmJ3MgdGFyZ2V0ICIsIHRhcmdldCwg IiBleGNlZWRzIGNvbnRyb2wgc3RhY2sgc2l6ZSAiLCBtX2NvbnRyb2xTdGFjay5zaXplKCkpOwot ICAgICAgICBpZiAob3AgPT0gT3BUeXBlOjpCcklmKQorICAgICAgICBpZiAob3AgPT0gQnJJZikK ICAgICAgICAgICAgIFdBU01fVFJZX1BPUF9FWFBSRVNTSU9OX1NUQUNLX0lOVE8oY29uZGl0aW9u LCAiYnIgLyBicl9pZiBjb25kaXRpb24iKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbV91 bnJlYWNoYWJsZUJsb2NrcyA9IDE7CkBAIC00NDcsNyArNDI5LDcgQEAgYXV0byBGdW5jdGlvblBh cnNlcjxDb250ZXh0Pjo6cGFyc2VFeHByZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJlc3Vs dAogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIGNhc2UgT3BUeXBlOjpCclRhYmxl OiB7CisgICAgY2FzZSBCclRhYmxlOiB7CiAgICAgICAgIHVpbnQzMl90IG51bWJlck9mVGFyZ2V0 czsKICAgICAgICAgRXhwcmVzc2lvblR5cGUgY29uZGl0aW9uOwogICAgICAgICB1aW50MzJfdCBk ZWZhdWx0VGFyZ2V0OwpAQCAtNDcyLDExICs0NTQsMTEgQEAgYXV0byBGdW5jdGlvblBhcnNlcjxD b250ZXh0Pjo6cGFyc2VFeHByZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFydGlhbFJlc3VsdAogICAg ICAgICByZXR1cm4geyB9OwogICAgIH0KIAotICAgIGNhc2UgT3BUeXBlOjpSZXR1cm46IHsKKyAg ICBjYXNlIFJldHVybjogewogICAgICAgICByZXR1cm4gYWRkUmV0dXJuKCk7CiAgICAgfQogCi0g ICAgY2FzZSBPcFR5cGU6OkVuZDogeworICAgIGNhc2UgRW5kOiB7CiAgICAgICAgIENvbnRyb2xF bnRyeSBkYXRhID0gbV9jb250cm9sU3RhY2sudGFrZUxhc3QoKTsKICAgICAgICAgLy8gRklYTUU6 IFRoaXMgaXMgYSBsaXR0bGUgd2VpcmQgaW4gdGhhdCBpdCB3aWxsIG1vZGlmeSB0aGUgZXhwcmVz c2lvblN0YWNrIGZvciB0aGUgcmVzdWx0IG9mIHRoZSBibG9jay4KICAgICAgICAgLy8gVGhhdCdz IGEgbGl0dGxlIHRvbyBlZmZlY3RmdWwgZm9yIG1lIGJ1dCBJIGRvbid0IGhhdmUgYSBiZXR0ZXIg QVBJIHJpZ2h0IG5vdy4KQEAgLTQ4NiwyNiArNDY4LDI2IEBAIGF1dG8gRnVuY3Rpb25QYXJzZXI8 Q29udGV4dD46OnBhcnNlRXhwcmVzc2lvbihPcFR5cGUgb3ApIC0+IFBhcnRpYWxSZXN1bHQKICAg ICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBjYXNlIE9wVHlwZTo6VW5yZWFjaGFibGU6 IHsKKyAgICBjYXNlIFVucmVhY2hhYmxlOiB7CiAgICAgICAgIFdBU01fVFJZX0FERF9UT19DT05U RVhUKGFkZFVucmVhY2hhYmxlKCkpOwogICAgICAgICBtX3VucmVhY2hhYmxlQmxvY2tzID0gMTsK ICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBjYXNlIE9wVHlwZTo6RHJvcDogewor ICAgIGNhc2UgRHJvcDogewogICAgICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFtX2V4cHJlc3Np b25TdGFjay5zaXplKCksICJjYW4ndCBkcm9wIG9uIGVtcHR5IHN0YWNrIik7CiAgICAgICAgIG1f ZXhwcmVzc2lvblN0YWNrLnRha2VMYXN0KCk7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQog Ci0gICAgY2FzZSBPcFR5cGU6Ok5vcDogeworICAgIGNhc2UgTm9wOiB7CiAgICAgICAgIHJldHVy biB7IH07CiAgICAgfQogCi0gICAgY2FzZSBPcFR5cGU6Okdyb3dNZW1vcnk6CisgICAgY2FzZSBH cm93TWVtb3J5OgogICAgICAgICByZXR1cm4gZmFpbCgibm90IHlldCBpbXBsZW1lbnRlZDogZ3Jv d19tZW1vcnkiKTsgLy8gRklYTUU6IE5vdCB5ZXQgaW1wbGVtZW50ZWQuCiAKLSAgICBjYXNlIE9w VHlwZTo6Q3VycmVudE1lbW9yeToKKyAgICBjYXNlIEN1cnJlbnRNZW1vcnk6CiAgICAgICAgIHJl dHVybiBmYWlsKCJub3QgeWV0IGltcGxlbWVudGVkOiBjdXJyZW50X21lbW9yeSIpOyAvLyBGSVhN RTogTm90IHlldCBpbXBsZW1lbnRlZC4KIAogICAgIH0KQEAgLTUxMywxMiArNDk1LDE0IEBAIGF1 dG8gRnVuY3Rpb25QYXJzZXI8Q29udGV4dD46OnBhcnNlRXhwcmVzc2lvbihPcFR5cGUgb3ApIC0+ IFBhcnRpYWxSZXN1bHQKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAorLy8gRklYTUU6 IFdlIHNob3VsZCB0cnkgdG8gdXNlIHRoZSBzYW1lIGRlY29kZXIgZnVuY3Rpb24gZm9yIGJvdGgg dW5yZWFjaGFibGUgYW5kIHJlYWNoYWJsZSBjb2RlLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTY1OTY1CiB0ZW1wbGF0ZTx0eXBlbmFtZSBDb250ZXh0PgogYXV0byBG dW5jdGlvblBhcnNlcjxDb250ZXh0Pjo6cGFyc2VVbnJlYWNoYWJsZUV4cHJlc3Npb24oT3BUeXBl IG9wKSAtPiBQYXJ0aWFsUmVzdWx0CiB7CiAgICAgQVNTRVJUKG1fdW5yZWFjaGFibGVCbG9ja3Mp OworI2RlZmluZSBDUkVBVEVfQ0FTRShuYW1lLCBpZCwgYjNvcCwgaW5jKSBjYXNlIE9wVHlwZTo6 bmFtZToKICAgICBzd2l0Y2ggKG9wKSB7Ci0gICAgY2FzZSBPcFR5cGU6OkVsc2U6IHsKKyAgICBj YXNlIEVsc2U6IHsKICAgICAgICAgaWYgKG1fdW5yZWFjaGFibGVCbG9ja3MgPiAxKQogICAgICAg ICAgICAgcmV0dXJuIHsgfTsKIApAQCAtNTI5LDcgKzUxMyw3IEBAIGF1dG8gRnVuY3Rpb25QYXJz ZXI8Q29udGV4dD46OnBhcnNlVW5yZWFjaGFibGVFeHByZXNzaW9uKE9wVHlwZSBvcCkgLT4gUGFy dGlhbFJlCiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCi0gICAgY2FzZSBPcFR5cGU6OkVu ZDogeworICAgIGNhc2UgRW5kOiB7CiAgICAgICAgIGlmIChtX3VucmVhY2hhYmxlQmxvY2tzID09 IDEpIHsKICAgICAgICAgICAgIENvbnRyb2xFbnRyeSBkYXRhID0gbV9jb250cm9sU3RhY2sudGFr ZUxhc3QoKTsKICAgICAgICAgICAgIFdBU01fVFJZX0FERF9UT19DT05URVhUKGFkZEVuZFRvVW5y ZWFjaGFibGUoZGF0YSkpOwpAQCAtNTM5LDM4ICs1MjMsNzIgQEAgYXV0byBGdW5jdGlvblBhcnNl cjxDb250ZXh0Pjo6cGFyc2VVbnJlYWNoYWJsZUV4cHJlc3Npb24oT3BUeXBlIG9wKSAtPiBQYXJ0 aWFsUmUKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKLSAgICBjYXNlIE9wVHlwZTo6TG9v cDoKLSAgICBjYXNlIE9wVHlwZTo6SWY6Ci0gICAgY2FzZSBPcFR5cGU6OkJsb2NrOiB7CisgICAg Y2FzZSBMb29wOgorICAgIGNhc2UgSWY6CisgICAgY2FzZSBCbG9jazogewogICAgICAgICBtX3Vu cmVhY2hhYmxlQmxvY2tzKys7CisgICAgICAgIGludDhfdCB1bnVzZWQ7CisgICAgICAgIFdBU01f UEFSU0VSX0ZBSUxfSUYoIXBhcnNlSW50Nyh1bnVzZWQpLCAiY2FuJ3QgZ2V0IGlubGluZSB0eXBl IGZvciAiLCBvcCwgIiBpbiB1bnJlYWNoYWJsZSBjb250ZXh0Iik7CiAgICAgICAgIHJldHVybiB7 IH07CiAgICAgfQogCisgICAgY2FzZSBCclRhYmxlOiB7CisgICAgICAgIHVpbnQzMl90IG51bWJl ck9mVGFyZ2V0czsKKyAgICAgICAgdWludDMyX3QgdW51c2VkOworICAgICAgICBXQVNNX1BBUlNF Ul9GQUlMX0lGKCFwYXJzZVZhclVJbnQzMihudW1iZXJPZlRhcmdldHMpLCAiY2FuJ3QgZ2V0IHRo ZSBudW1iZXIgb2YgdGFyZ2V0cyBmb3IgYnJfdGFibGUgaW4gdW5yZWFjaGFibGUgY29udGV4dCIp OworICAgICAgICBXQVNNX1BBUlNFUl9GQUlMX0lGKG51bWJlck9mVGFyZ2V0cyA9PSBzdGQ6Om51 bWVyaWNfbGltaXRzPHVpbnQzMl90Pjo6bWF4KCksICJicl90YWJsZSdzIG51bWJlciBvZiB0YXJn ZXRzIGlzIHRvbyBiaWcgIiwgbnVtYmVyT2ZUYXJnZXRzKTsKKworICAgICAgICBmb3IgKHVpbnQz Ml90IGkgPSAwOyBpIDwgbnVtYmVyT2ZUYXJnZXRzOyArK2kpCisgICAgICAgICAgICBXQVNNX1BB UlNFUl9GQUlMX0lGKCFwYXJzZVZhclVJbnQzMih1bnVzZWQpLCAiY2FuJ3QgZ2V0ICIsIGksICJ0 aCB0YXJnZXQgZm9yIGJyX3RhYmxlIGluIHVucmVhY2hhYmxlIGNvbnRleHQiKTsKKworICAgICAg ICBXQVNNX1BBUlNFUl9GQUlMX0lGKCFwYXJzZVZhclVJbnQzMih1bnVzZWQpLCAiY2FuJ3QgZ2V0 IGRlZmF1bHQgdGFyZ2V0IGZvciBicl90YWJsZSBpbiB1bnJlYWNoYWJsZSBjb250ZXh0Iik7Cisg ICAgICAgIHJldHVybiB7IH07CisgICAgfQorCisKICAgICAvLyB0d28gaW1tZWRpYXRlIGNhc2Vz Ci0gICAgY2FzZSBPcFR5cGU6OkJyOgotICAgIGNhc2UgT3BUeXBlOjpCcklmOiB7CisgICAgRk9S X0VBQ0hfV0FTTV9NRU1PUllfTE9BRF9PUChDUkVBVEVfQ0FTRSkKKyAgICBGT1JfRUFDSF9XQVNN X01FTU9SWV9TVE9SRV9PUChDUkVBVEVfQ0FTRSkKKyAgICBjYXNlIEJyOgorICAgIGNhc2UgQnJJ ZjoKKyAgICBjYXNlIENhbGxJbmRpcmVjdDogewogICAgICAgICB1aW50MzJfdCB1bnVzZWQ7Ci0g ICAgICAgIFdBU01fUEFSU0VSX0ZBSUxfSUYoIXBhcnNlVmFyVUludDMyKHVudXNlZCksICJjYW4n dCBnZXQgYnIgLyBicl9pZiBpbiB1bnJlYWNoYWJsZSBjb250ZXh0Iik7Ci0gICAgICAgIFdBU01f UEFSU0VSX0ZBSUxfSUYoIXBhcnNlVmFyVUludDMyKHVudXNlZCksICJjYW4ndCBnZXQgYnIgLyBi cl9pZiBpbiB1bnJlYWNoYWJsZSBjb250ZXh0Iik7CisgICAgICAgIFdBU01fUEFSU0VSX0ZBSUxf SUYoIXBhcnNlVmFyVUludDMyKHVudXNlZCksICJjYW4ndCBnZXQgZmlyc3QgaW1tZWRpYXRlIGZv ciAiLCBvcCwgIiBpbiB1bnJlYWNoYWJsZSBjb250ZXh0Iik7CisgICAgICAgIFdBU01fUEFSU0VS X0ZBSUxfSUYoIXBhcnNlVmFyVUludDMyKHVudXNlZCksICJjYW4ndCBnZXQgc2Vjb25kIGltbWVk aWF0ZSBmb3IgIiwgb3AsICIgaW4gdW5yZWFjaGFibGUgY29udGV4dCIpOwogICAgICAgICByZXR1 cm4geyB9OwogICAgIH0KIAogICAgIC8vIG9uZSBpbW1lZGlhdGUgY2FzZXMKLSAgICBjYXNlIE9w VHlwZTo6RjMyQ29uc3Q6Ci0gICAgY2FzZSBPcFR5cGU6OkkzMkNvbnN0OgotICAgIGNhc2UgT3BU eXBlOjpGNjRDb25zdDoKLSAgICBjYXNlIE9wVHlwZTo6STY0Q29uc3Q6Ci0gICAgY2FzZSBPcFR5 cGU6OlNldExvY2FsOgotICAgIGNhc2UgT3BUeXBlOjpHZXRMb2NhbDogeworICAgIGNhc2UgRjMy Q29uc3Q6CisgICAgY2FzZSBJMzJDb25zdDoKKyAgICBjYXNlIEY2NENvbnN0OgorICAgIGNhc2Ug STY0Q29uc3Q6CisgICAgY2FzZSBTZXRMb2NhbDoKKyAgICBjYXNlIEdldExvY2FsOgorICAgIGNh c2UgVGVlTG9jYWw6CisgICAgY2FzZSBHZXRHbG9iYWw6CisgICAgY2FzZSBTZXRHbG9iYWw6Cisg ICAgY2FzZSBDYWxsOiB7CiAgICAgICAgIHVpbnQzMl90IHVudXNlZDsKLSAgICAgICAgV0FTTV9Q QVJTRVJfRkFJTF9JRighcGFyc2VWYXJVSW50MzIodW51c2VkKSwgImNhbid0IGdldCBjb25zdCAv IGxvY2FsIGluIHVucmVhY2hhYmxlIGNvbnRleHQiKTsKKyAgICAgICAgV0FTTV9QQVJTRVJfRkFJ TF9JRighcGFyc2VWYXJVSW50MzIodW51c2VkKSwgImNhbid0IGdldCBpbW1lZGlhdGUgZm9yICIs IG9wLCAiIGluIHVucmVhY2hhYmxlIGNvbnRleHQiKTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAg ICB9CiAKLSAgICBkZWZhdWx0OgotICAgICAgICBicmVhazsKKyAgICAvLyBubyBpbW1lZGlhdGUg Y2FzZXMKKyAgICBGT1JfRUFDSF9XQVNNX0JJTkFSWV9PUChDUkVBVEVfQ0FTRSkKKyAgICBGT1Jf RUFDSF9XQVNNX1VOQVJZX09QKENSRUFURV9DQVNFKQorICAgIGNhc2UgVW5yZWFjaGFibGU6Cisg ICAgY2FzZSBOb3A6CisgICAgY2FzZSBSZXR1cm46CisgICAgY2FzZSBTZWxlY3Q6CisgICAgY2Fz ZSBEcm9wOgorICAgIGNhc2UgR3Jvd01lbW9yeToKKyAgICBjYXNlIEN1cnJlbnRNZW1vcnk6IHsK KyAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9Ci0gICAgcmV0dXJuIHsgfTsKKyAgICB9CisjdW5k ZWYgQ1JFQVRFX0NBU0UKKyAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiB9 IH0gLy8gbmFtZXNwYWNlIEpTQzo6V2FzbQo=