170242 2017-03-29 09:03:52 -0700 WebAssembly: NFC s/goto/lambda/g 2017-03-29 10:17:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 170219 1 jfbastien jfbastien buildbot commit-queue jfbastien keith_miller mark.lam msaboff saam oldest_to_newest 1292406 0 jfbastien 2017-03-29 09:03:52 -0700 As suggested in https://bugs.webkit.org/show_bug.cgi?id=170219, my early-2000 C++ skillz should be updated to "post-modern C++". `goto fail` isn't as nice as lambdas. 1292414 1 305740 jfbastien 2017-03-29 09:07:30 -0700 Created attachment 305740 patch goto lambda; 1292423 2 305740 mark.lam 2017-03-29 09:17:01 -0700 Comment on attachment 305740 patch View in context: https://bugs.webkit.org/attachment.cgi?id=305740&action=review r=me with suggested fix. > Source/JavaScriptCore/wasm/WasmMemory.cpp:121 > + auto fail = [&] () -> bool { This does not need to be a [&] lambda, right? Just [] should do. 1292425 3 305746 jfbastien 2017-03-29 09:22:09 -0700 Created attachment 305746 patch No need to capture in lambda. 1292445 4 305751 jfbastien 2017-03-29 10:02:21 -0700 Created attachment 305751 patch Forgot to update reviewer. 1292459 5 305751 commit-queue 2017-03-29 10:17:52 -0700 Comment on attachment 305751 patch Clearing flags on attachment: 305751 Committed r214541: <http://trac.webkit.org/changeset/214541> 1292460 6 commit-queue 2017-03-29 10:17:56 -0700 All reviewed patches have been landed. Closing bug. 305740 2017-03-29 09:07:30 -0700 2017-03-29 09:22:09 -0700 patch 0001-goto-lambda.patch text/plain 2837 jfbastien RnJvbSA1NzgxZWRlZTlkMTE3MzNmOWFlOGNjMjNjMWI3NDY1MDUxMGU3MzNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKRiBCYXN0aWVuIDxqZmJhc3RpZW5AYXBwbGUuY29tPgpEYXRl OiBXZWQsIDI5IE1hciAyMDE3IDA5OjA2OjQxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gZ290by1s YW1iZGEKCi0tLQogU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgfCAx MiArKysrKysrKysrKysKIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21NZW1vcnkuY3Bw IHwgMTkgKysrKysrKysrKy0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDEzMGNkYWUu Ljc1MzZjMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3 LTAzLTI5ICBKRiBCYXN0aWVuICA8amZiYXN0aWVuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJB c3NlbWJseTogTkZDIHMvZ290by9sYW1iZGEvZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTGFtYmRhcyBhcmUgbW9yZSBpbi1zdHlsZSB0aGFuIHRoZSBn b3RvIEkganVzdCB1c2VkLgorCisgICAgICAgICogd2FzbS9XYXNtTWVtb3J5LmNwcDoKKyAgICAg ICAgKEpTQzo6V2FzbTo6dHJ5R2V0RmFzdE1lbW9yeSk6CisKIDIwMTctMDMtMjggIFNhYW0gQmFy YXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQXNzZW1ibHlIZWxwZXJzIHNob3Vs ZCBub3QgaGF2ZSBhIFZNIGZpZWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv d2FzbS9XYXNtTWVtb3J5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21NZW1v cnkuY3BwCmluZGV4IDJiNjUyMTAuLjE3MmQwMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS93YXNtL1dhc21NZW1vcnkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL1dhc21NZW1vcnkuY3BwCkBAIC0xMTgsMTUgKzExOCwyMSBAQCBpbmxpbmUgYm9vbCB0cnlH ZXRGYXN0TWVtb3J5KFZNJiB2bSwgdm9pZComIG1lbW9yeSwgc2l6ZV90JiBtYXBwZWRDYXBhY2l0 eSwgTWVtbwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfTsKIAorICAgIGF1dG8gZmFpbCA9 IFsmXSAoKSAtPiBib29sIHsKKyAgICAgICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6OmNyYXNoSWZX ZWJBc3NlbWJseUNhbnRGYXN0TWVtb3J5KCkpKQorICAgICAgICAgICAgd2ViQXNzZW1ibHlDb3Vs ZG50R2V0RmFzdE1lbW9yeSgpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfTsKKwogICAg IC8vIFdlIG1pZ2h0IEdDIGhlcmUgc28gd2Ugc2hvdWxkIGJlIGhvbGRpbmcgdGhlIEFQSSBsb2Nr LgogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byBzeW5jcm9ub3VzbHkgdHJpZ2dl ciB0aGUgR0MgZnJvbSBhbm90aGVyIHRocmVhZC4KICAgICBBU1NFUlQodm0uY3VycmVudFRocmVh ZElzSG9sZGluZ0FQSUxvY2soKSk7CiAgICAgaWYgKFVOTElLRUxZKCFmYXN0TWVtb3J5RW5hYmxl ZCgpKSkKLSAgICAgICAgZ290byBmYWlsOworICAgICAgICByZXR1cm4gZmFpbCgpOwogCiAgICAg Ly8gV2UgbmVlZCB0byBiZSBzdXJlIHdlIGhhdmUgYSBzdHViIHByaW9yIHRvIHJ1bm5pbmcgY29k ZS4KICAgICBpZiAoVU5MSUtFTFkoIXZtLmdldENUSVN0dWIodGhyb3dFeGNlcHRpb25Gcm9tV2Fz bVRodW5rR2VuZXJhdG9yKS5zaXplKCkpKQotICAgICAgICBnb3RvIGZhaWw7CisgICAgICAgIHJl dHVybiBmYWlsKCk7CiAKICAgICBBU1NFUlQoYWxsb2NhdGVkRmFzdE1lbW9yaWVzIDw9IG1heEZh c3RNZW1vcmllcyk7CiAgICAgaWYgKGRlcXVlRmFzdE1lbW9yeSgpKQpAQCAtMTM4LDcgKzE0NCw3 IEBAIGlubGluZSBib29sIHRyeUdldEZhc3RNZW1vcnkoVk0mIHZtLCB2b2lkKiYgbWVtb3J5LCBz aXplX3QmIG1hcHBlZENhcGFjaXR5LCBNZW1vCiAgICAgICAgIHZtLmhlYXAuY29sbGVjdEFsbEdh cmJhZ2UoKTsKICAgICAgICAgaWYgKGRlcXVlRmFzdE1lbW9yeSgpKQogICAgICAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgICAgIGdvdG8gZmFpbDsKKyAgICAgICAgcmV0dXJuIGZhaWwoKTsKICAg ICB9CiAKICAgICBpZiAobW1hcEJ5dGVzKGZhc3RNZW1vcnlNYXBwZWRCeXRlcywgbWVtb3J5KSkg ewpAQCAtMTUyLDEzICsxNTgsOCBAQCBpbmxpbmUgYm9vbCB0cnlHZXRGYXN0TWVtb3J5KFZNJiB2 bSwgdm9pZComIG1lbW9yeSwgc2l6ZV90JiBtYXBwZWRDYXBhY2l0eSwgTWVtbwogCiAgICAgaWYg KG1lbW9yeSkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgZ290byBmYWlsOwotCi1mYWlsOgot ICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjpjcmFzaElmV2ViQXNzZW1ibHlDYW50RmFzdE1lbW9y eSgpKSkKLSAgICAgICAgd2ViQXNzZW1ibHlDb3VsZG50R2V0RmFzdE1lbW9yeSgpOwogCi0gICAg cmV0dXJuIGZhbHNlOworICAgIHJldHVybiBmYWlsKCk7CiB9CiAKIGlubGluZSB2b2lkIHJlbGVh c2VGYXN0TWVtb3J5KHZvaWQqJiBtZW1vcnksIHNpemVfdCB3cml0YWJsZVNpemUsIHNpemVfdCBt YXBwZWRDYXBhY2l0eSwgTWVtb3J5TW9kZSBtb2RlKQotLSAKMi4xMC4xCgo= 305746 2017-03-29 09:22:09 -0700 2017-03-29 10:02:21 -0700 patch 0001-goto-lambda.patch text/plain 2836 jfbastien RnJvbSA1YmFmYjZkNGFkNmY5ZGU4N2ExM2YzYjE5M2YxNTA1ZTVhZGFlMWVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKRiBCYXN0aWVuIDxqZmJhc3RpZW5AYXBwbGUuY29tPgpEYXRl OiBXZWQsIDI5IE1hciAyMDE3IDA5OjA2OjQxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gZ290by1s YW1iZGEKCi0tLQogU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgfCAx MiArKysrKysrKysrKysKIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21NZW1vcnkuY3Bw IHwgMTkgKysrKysrKysrKy0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDEzMGNkYWUu Ljc1MzZjMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3 LTAzLTI5ICBKRiBCYXN0aWVuICA8amZiYXN0aWVuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJB c3NlbWJseTogTkZDIHMvZ290by9sYW1iZGEvZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTGFtYmRhcyBhcmUgbW9yZSBpbi1zdHlsZSB0aGFuIHRoZSBn b3RvIEkganVzdCB1c2VkLgorCisgICAgICAgICogd2FzbS9XYXNtTWVtb3J5LmNwcDoKKyAgICAg ICAgKEpTQzo6V2FzbTo6dHJ5R2V0RmFzdE1lbW9yeSk6CisKIDIwMTctMDMtMjggIFNhYW0gQmFy YXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQXNzZW1ibHlIZWxwZXJzIHNob3Vs ZCBub3QgaGF2ZSBhIFZNIGZpZWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv d2FzbS9XYXNtTWVtb3J5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21NZW1v cnkuY3BwCmluZGV4IDJiNjUyMTAuLjZjMjUzODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS93YXNtL1dhc21NZW1vcnkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 YXNtL1dhc21NZW1vcnkuY3BwCkBAIC0xMTgsMTUgKzExOCwyMSBAQCBpbmxpbmUgYm9vbCB0cnlH ZXRGYXN0TWVtb3J5KFZNJiB2bSwgdm9pZComIG1lbW9yeSwgc2l6ZV90JiBtYXBwZWRDYXBhY2l0 eSwgTWVtbwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfTsKIAorICAgIGF1dG8gZmFpbCA9 IFtdICgpIC0+IGJvb2wgeworICAgICAgICBpZiAoVU5MSUtFTFkoT3B0aW9uczo6Y3Jhc2hJZldl YkFzc2VtYmx5Q2FudEZhc3RNZW1vcnkoKSkpCisgICAgICAgICAgICB3ZWJBc3NlbWJseUNvdWxk bnRHZXRGYXN0TWVtb3J5KCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9OworCiAgICAg Ly8gV2UgbWlnaHQgR0MgaGVyZSBzbyB3ZSBzaG91bGQgYmUgaG9sZGluZyB0aGUgQVBJIGxvY2su CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBiZSBhYmxlIHRvIHN5bmNyb25vdXNseSB0cmlnZ2Vy IHRoZSBHQyBmcm9tIGFub3RoZXIgdGhyZWFkLgogICAgIEFTU0VSVCh2bS5jdXJyZW50VGhyZWFk SXNIb2xkaW5nQVBJTG9jaygpKTsKICAgICBpZiAoVU5MSUtFTFkoIWZhc3RNZW1vcnlFbmFibGVk KCkpKQotICAgICAgICBnb3RvIGZhaWw7CisgICAgICAgIHJldHVybiBmYWlsKCk7CiAKICAgICAv LyBXZSBuZWVkIHRvIGJlIHN1cmUgd2UgaGF2ZSBhIHN0dWIgcHJpb3IgdG8gcnVubmluZyBjb2Rl LgogICAgIGlmIChVTkxJS0VMWSghdm0uZ2V0Q1RJU3R1Yih0aHJvd0V4Y2VwdGlvbkZyb21XYXNt VGh1bmtHZW5lcmF0b3IpLnNpemUoKSkpCi0gICAgICAgIGdvdG8gZmFpbDsKKyAgICAgICAgcmV0 dXJuIGZhaWwoKTsKIAogICAgIEFTU0VSVChhbGxvY2F0ZWRGYXN0TWVtb3JpZXMgPD0gbWF4RmFz dE1lbW9yaWVzKTsKICAgICBpZiAoZGVxdWVGYXN0TWVtb3J5KCkpCkBAIC0xMzgsNyArMTQ0LDcg QEAgaW5saW5lIGJvb2wgdHJ5R2V0RmFzdE1lbW9yeShWTSYgdm0sIHZvaWQqJiBtZW1vcnksIHNp emVfdCYgbWFwcGVkQ2FwYWNpdHksIE1lbW8KICAgICAgICAgdm0uaGVhcC5jb2xsZWN0QWxsR2Fy YmFnZSgpOwogICAgICAgICBpZiAoZGVxdWVGYXN0TWVtb3J5KCkpCiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKLSAgICAgICAgZ290byBmYWlsOworICAgICAgICByZXR1cm4gZmFpbCgpOwogICAg IH0KIAogICAgIGlmIChtbWFwQnl0ZXMoZmFzdE1lbW9yeU1hcHBlZEJ5dGVzLCBtZW1vcnkpKSB7 CkBAIC0xNTIsMTMgKzE1OCw4IEBAIGlubGluZSBib29sIHRyeUdldEZhc3RNZW1vcnkoVk0mIHZt LCB2b2lkKiYgbWVtb3J5LCBzaXplX3QmIG1hcHBlZENhcGFjaXR5LCBNZW1vCiAKICAgICBpZiAo bWVtb3J5KQogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICBnb3RvIGZhaWw7Ci0KLWZhaWw6Ci0g ICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6OmNyYXNoSWZXZWJBc3NlbWJseUNhbnRGYXN0TWVtb3J5 KCkpKQotICAgICAgICB3ZWJBc3NlbWJseUNvdWxkbnRHZXRGYXN0TWVtb3J5KCk7CiAKLSAgICBy ZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIGZhaWwoKTsKIH0KIAogaW5saW5lIHZvaWQgcmVsZWFz ZUZhc3RNZW1vcnkodm9pZComIG1lbW9yeSwgc2l6ZV90IHdyaXRhYmxlU2l6ZSwgc2l6ZV90IG1h cHBlZENhcGFjaXR5LCBNZW1vcnlNb2RlIG1vZGUpCi0tIAoyLjEwLjEKCg== 305751 2017-03-29 10:02:21 -0700 2017-03-29 10:17:52 -0700 patch 0001-goto-lambda.patch text/plain 2830 jfbastien RnJvbSA1YmFmYjZkNGFkNmY5ZGU4N2ExM2YzYjE5M2YxNTA1ZTVhZGFlMWVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKRiBCYXN0aWVuIDxqZmJhc3RpZW5AYXBwbGUuY29tPgpEYXRl OiBXZWQsIDI5IE1hciAyMDE3IDA5OjA2OjQxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gZ290by1s YW1iZGEKCi0tLQogU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgfCAx MiArKysrKysrKysrKysKIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21NZW1vcnkuY3Bw IHwgMTkgKysrKysrKysrKy0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDEzMGNkYWUu Ljc1MzZjMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3 LTAzLTI5ICBKRiBCYXN0aWVuICA8amZiYXN0aWVuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJB c3NlbWJseTogTkZDIHMvZ290by9sYW1iZGEvZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBM YW0uCisKKyAgICAgICAgTGFtYmRhcyBhcmUgbW9yZSBpbi1zdHlsZSB0aGFuIHRoZSBnb3RvIEkg anVzdCB1c2VkLgorCisgICAgICAgICogd2FzbS9XYXNtTWVtb3J5LmNwcDoKKyAgICAgICAgKEpT Qzo6V2FzbTo6dHJ5R2V0RmFzdE1lbW9yeSk6CisKIDIwMTctMDMtMjggIFNhYW0gQmFyYXRpICA8 c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQXNzZW1ibHlIZWxwZXJzIHNob3VsZCBub3Qg aGF2ZSBhIFZNIGZpZWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9X YXNtTWVtb3J5LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21NZW1vcnkuY3Bw CmluZGV4IDJiNjUyMTAuLjZjMjUzODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS93YXNtL1dhc21NZW1vcnkuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dh c21NZW1vcnkuY3BwCkBAIC0xMTgsMTUgKzExOCwyMSBAQCBpbmxpbmUgYm9vbCB0cnlHZXRGYXN0 TWVtb3J5KFZNJiB2bSwgdm9pZComIG1lbW9yeSwgc2l6ZV90JiBtYXBwZWRDYXBhY2l0eSwgTWVt bwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfTsKIAorICAgIGF1dG8gZmFpbCA9IFtdICgp IC0+IGJvb2wgeworICAgICAgICBpZiAoVU5MSUtFTFkoT3B0aW9uczo6Y3Jhc2hJZldlYkFzc2Vt Ymx5Q2FudEZhc3RNZW1vcnkoKSkpCisgICAgICAgICAgICB3ZWJBc3NlbWJseUNvdWxkbnRHZXRG YXN0TWVtb3J5KCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9OworCiAgICAgLy8gV2Ug bWlnaHQgR0MgaGVyZSBzbyB3ZSBzaG91bGQgYmUgaG9sZGluZyB0aGUgQVBJIGxvY2suCiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBiZSBhYmxlIHRvIHN5bmNyb25vdXNseSB0cmlnZ2VyIHRoZSBH QyBmcm9tIGFub3RoZXIgdGhyZWFkLgogICAgIEFTU0VSVCh2bS5jdXJyZW50VGhyZWFkSXNIb2xk aW5nQVBJTG9jaygpKTsKICAgICBpZiAoVU5MSUtFTFkoIWZhc3RNZW1vcnlFbmFibGVkKCkpKQot ICAgICAgICBnb3RvIGZhaWw7CisgICAgICAgIHJldHVybiBmYWlsKCk7CiAKICAgICAvLyBXZSBu ZWVkIHRvIGJlIHN1cmUgd2UgaGF2ZSBhIHN0dWIgcHJpb3IgdG8gcnVubmluZyBjb2RlLgogICAg IGlmIChVTkxJS0VMWSghdm0uZ2V0Q1RJU3R1Yih0aHJvd0V4Y2VwdGlvbkZyb21XYXNtVGh1bmtH ZW5lcmF0b3IpLnNpemUoKSkpCi0gICAgICAgIGdvdG8gZmFpbDsKKyAgICAgICAgcmV0dXJuIGZh aWwoKTsKIAogICAgIEFTU0VSVChhbGxvY2F0ZWRGYXN0TWVtb3JpZXMgPD0gbWF4RmFzdE1lbW9y aWVzKTsKICAgICBpZiAoZGVxdWVGYXN0TWVtb3J5KCkpCkBAIC0xMzgsNyArMTQ0LDcgQEAgaW5s aW5lIGJvb2wgdHJ5R2V0RmFzdE1lbW9yeShWTSYgdm0sIHZvaWQqJiBtZW1vcnksIHNpemVfdCYg bWFwcGVkQ2FwYWNpdHksIE1lbW8KICAgICAgICAgdm0uaGVhcC5jb2xsZWN0QWxsR2FyYmFnZSgp OwogICAgICAgICBpZiAoZGVxdWVGYXN0TWVtb3J5KCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICAgICAgZ290byBmYWlsOworICAgICAgICByZXR1cm4gZmFpbCgpOwogICAgIH0KIAog ICAgIGlmIChtbWFwQnl0ZXMoZmFzdE1lbW9yeU1hcHBlZEJ5dGVzLCBtZW1vcnkpKSB7CkBAIC0x NTIsMTMgKzE1OCw4IEBAIGlubGluZSBib29sIHRyeUdldEZhc3RNZW1vcnkoVk0mIHZtLCB2b2lk KiYgbWVtb3J5LCBzaXplX3QmIG1hcHBlZENhcGFjaXR5LCBNZW1vCiAKICAgICBpZiAobWVtb3J5 KQogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICBnb3RvIGZhaWw7Ci0KLWZhaWw6Ci0gICAgaWYg KFVOTElLRUxZKE9wdGlvbnM6OmNyYXNoSWZXZWJBc3NlbWJseUNhbnRGYXN0TWVtb3J5KCkpKQot ICAgICAgICB3ZWJBc3NlbWJseUNvdWxkbnRHZXRGYXN0TWVtb3J5KCk7CiAKLSAgICByZXR1cm4g ZmFsc2U7CisgICAgcmV0dXJuIGZhaWwoKTsKIH0KIAogaW5saW5lIHZvaWQgcmVsZWFzZUZhc3RN ZW1vcnkodm9pZComIG1lbW9yeSwgc2l6ZV90IHdyaXRhYmxlU2l6ZSwgc2l6ZV90IG1hcHBlZENh cGFjaXR5LCBNZW1vcnlNb2RlIG1vZGUpCi0tIAoyLjEwLjEKCg==