194038 2019-01-30 13:24:58 -0800 WasmB3IRGenerator models some effects incorrectly 2019-03-14 17:11:08 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam commit-queue ews-watchlist keith_miller mark.lam msaboff webkit-bug-importer oldest_to_newest 1500134 0 saam 2019-01-30 13:24:58 -0800 ... 1500138 1 360607 saam 2019-01-30 13:25:51 -0800 Created attachment 360607 WIP 1507115 2 362240 saam 2019-02-17 11:58:23 -0800 Created attachment 362240 patch 1507138 3 362240 keith_miller 2019-02-17 13:20:30 -0800 Comment on attachment 362240 patch View in context: https://bugs.webkit.org/attachment.cgi?id=362240&action=review > Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp:-320 > - patchpoint->append(instanceValue(), ValueRep::SomeRegister); How did this ever work?... I guess we just usually don’t take this path and/or B3 rematerialized the value? 1507184 4 362240 saam 2019-02-17 20:13:14 -0800 Comment on attachment 362240 patch View in context: https://bugs.webkit.org/attachment.cgi?id=362240&action=review >> Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp:-320 >> - patchpoint->append(instanceValue(), ValueRep::SomeRegister); > > How did this ever work?... I guess we just usually don’t take this path and/or B3 rematerialized the value? Dunno. Maybe the non-Darwin ports aren’t testing Wasm? 1507185 5 362240 commit-queue 2019-02-17 20:40:19 -0800 Comment on attachment 362240 patch Clearing flags on attachment: 362240 Committed r241657: <https://trac.webkit.org/changeset/241657> 1507186 6 commit-queue 2019-02-17 20:40:21 -0800 All reviewed patches have been landed. Closing bug. 1507187 7 webkit-bug-importer 2019-02-17 20:41:21 -0800 <rdar://problem/48153007> 360607 2019-01-30 13:25:51 -0800 2019-02-17 11:58:23 -0800 WIP patch2.diff text/plain 3899 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21CM0lSR2VuZXJhdG9yLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtQjNJUkdlbmVyYXRv ci5jcHAJKHJldmlzaW9uIDI0MDY5NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dh c21CM0lSR2VuZXJhdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYxLDcgKzE2MSw3IEBAIHB1 YmxpYzoKICAgICB0eXBlZGVmIENvbnRyb2xEYXRhOjpSZXN1bHRMaXN0IFJlc3VsdExpc3Q7CiAg ICAgdHlwZWRlZiBGdW5jdGlvblBhcnNlcjxCM0lSR2VuZXJhdG9yPjo6Q29udHJvbEVudHJ5IENv bnRyb2xFbnRyeTsKIAotICAgIHN0YXRpYyBjb25zdGV4cHIgRXhwcmVzc2lvblR5cGUgZW1wdHlF eHByZXNzaW9uID0gbnVsbHB0cjsKKyAgICBzdGF0aWMgY29uc3RleHByIEV4cHJlc3Npb25UeXBl IGVtcHR5RXhwcmVzc2lvbigpIHsgcmV0dXJuIG51bGxwdHI7IH0KIAogICAgIHR5cGVkZWYgU3Ry aW5nIEVycm9yVHlwZTsKICAgICB0eXBlZGVmIFVuZXhwZWN0ZWQ8RXJyb3JUeXBlPiBVbmV4cGVj dGVkUmVzdWx0OwpAQCAtMzE1LDcgKzMxNSw3IEBAIHZvaWQgQjNJUkdlbmVyYXRvcjo6cmVzdG9y ZVdhc21Db250ZXh0SW4KICAgICBlZmZlY3RzLnJlYWRzID0gQjM6OkhlYXBSYW5nZTo6dG9wKCk7 CiAgICAgcGF0Y2hwb2ludC0+ZWZmZWN0cyA9IGVmZmVjdHM7CiAgICAgcGF0Y2hwb2ludC0+Y2xv YmJlckxhdGUoUmVnaXN0ZXJTZXQobV93YXNtQ29udGV4dEluc3RhbmNlR1BSKSk7Ci0gICAgcGF0 Y2hwb2ludC0+YXBwZW5kKGluc3RhbmNlVmFsdWUoKSwgVmFsdWVSZXA6OlNvbWVSZWdpc3Rlcik7 CisgICAgcGF0Y2hwb2ludC0+YXBwZW5kKGluc3RhbmNlVmFsdWUoKSwgVmFsdWVSZXA6OlNvbWVS ZWdpc3Rlcik7IC8vIE9PUFM6IFByb2JhYmx5IHNob3VsZCBiZSB1c2luZyBhcmchCiAgICAgR1BS UmVnIHdhc21Db250ZXh0SW5zdGFuY2VHUFIgPSBtX3dhc21Db250ZXh0SW5zdGFuY2VHUFI7CiAg ICAgcGF0Y2hwb2ludC0+c2V0R2VuZXJhdG9yKFs9XSAoQ0NhbGxIZWxwZXJzJiBqaXQsIGNvbnN0 IFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYgcGFyYW0pIHsKICAgICAgICAgaml0Lm1vdmUocGFy YW1bMF0uZ3ByKCksIHdhc21Db250ZXh0SW5zdGFuY2VHUFIpOwpAQCAtNDU5LDkgKzQ1OSw5IEBA IHZvaWQgQjNJUkdlbmVyYXRvcjo6cmVzdG9yZVdlYkFzc2VtYmx5R2wKIAogICAgIGlmIChyZXN0 b3JlQ2FjaGVkU3RhY2tMaW1pdCA9PSBSZXN0b3JlQ2FjaGVkU3RhY2tMaW1pdDo6WWVzKSB7CiAg ICAgICAgIC8vIFRoZSBJbnN0YW5jZSBjYWNoZXMgdGhlIHN0YWNrIGxpbWl0LCBidXQgYWxzbyBr bm93cyB3aGVyZSBpdHMgY2Fub25pY2FsIGxvY2F0aW9uIGlzLgotICAgICAgICBWYWx1ZSogcG9p bnRlclRvQWN0dWFsU3RhY2tMaW1pdCA9IG1fY3VycmVudEJsb2NrLT5hcHBlbmROZXc8TWVtb3J5 VmFsdWU+KG1fcHJvYywgTG9hZCwgcG9pbnRlclR5cGUoKSwgb3JpZ2luKCksIGluc3RhbmNlVmFs dWUoKSwgc2FmZUNhc3Q8aW50MzJfdD4oSW5zdGFuY2U6Om9mZnNldE9mUG9pbnRlclRvQWN0dWFs U3RhY2tMaW1pdCgpKSk7Ci0gICAgICAgIFZhbHVlKiBhY3R1YWxTdGFja0xpbWl0ID0gbV9jdXJy ZW50QmxvY2stPmFwcGVuZE5ldzxNZW1vcnlWYWx1ZT4obV9wcm9jLCBMb2FkLCBwb2ludGVyVHlw ZSgpLCBvcmlnaW4oKSwgcG9pbnRlclRvQWN0dWFsU3RhY2tMaW1pdCk7Ci0gICAgICAgIG1fY3Vy cmVudEJsb2NrLT5hcHBlbmROZXc8TWVtb3J5VmFsdWU+KG1fcHJvYywgU3RvcmUsIG9yaWdpbigp LCBhY3R1YWxTdGFja0xpbWl0LCBpbnN0YW5jZVZhbHVlKCksIHNhZmVDYXN0PGludDMyX3Q+KElu c3RhbmNlOjpvZmZzZXRPZkNhY2hlZFN0YWNrTGltaXQoKSkpOworICAgICAgICBWYWx1ZSogcG9p bnRlclRvQWN0dWFsU3RhY2tMaW1pdCA9IGJsb2NrLT5hcHBlbmROZXc8TWVtb3J5VmFsdWU+KG1f cHJvYywgTG9hZCwgcG9pbnRlclR5cGUoKSwgb3JpZ2luKCksIGluc3RhbmNlVmFsdWUoKSwgc2Fm ZUNhc3Q8aW50MzJfdD4oSW5zdGFuY2U6Om9mZnNldE9mUG9pbnRlclRvQWN0dWFsU3RhY2tMaW1p dCgpKSk7CisgICAgICAgIFZhbHVlKiBhY3R1YWxTdGFja0xpbWl0ID0gYmxvY2stPmFwcGVuZE5l dzxNZW1vcnlWYWx1ZT4obV9wcm9jLCBMb2FkLCBwb2ludGVyVHlwZSgpLCBvcmlnaW4oKSwgcG9p bnRlclRvQWN0dWFsU3RhY2tMaW1pdCk7CisgICAgICAgIGJsb2NrLT5hcHBlbmROZXc8TWVtb3J5 VmFsdWU+KG1fcHJvYywgU3RvcmUsIG9yaWdpbigpLCBhY3R1YWxTdGFja0xpbWl0LCBpbnN0YW5j ZVZhbHVlKCksIHNhZmVDYXN0PGludDMyX3Q+KEluc3RhbmNlOjpvZmZzZXRPZkNhY2hlZFN0YWNr TGltaXQoKSkpOyAvLyBPT1BTOiBzaG91bGQgYmUgYmxvY2shCiAgICAgfQogCiAgICAgaWYgKCEh bWVtb3J5KSB7CkBAIC0xNjA5LDYgKzE2MDksNyBAQCBhdXRvIEIzSVJHZW5lcmF0b3I6OmFkZE9w PEY2NENvbnZlcnRVSTY0CiAgICAgaWYgKGlzWDg2KCkpCiAgICAgICAgIHBhdGNocG9pbnQtPm51 bUdQU2NyYXRjaFJlZ2lzdGVycyA9IDE7CiAgICAgcGF0Y2hwb2ludC0+YXBwZW5kKENvbnN0cmFp bmVkVmFsdWUoYXJnLCBWYWx1ZVJlcDo6U29tZVJlZ2lzdGVyKSk7CisgICAgcGF0Y2hwb2ludC0+ Y2xvYmJlcihSZWdpc3RlclNldDo6bWFjcm9TY3JhdGNoUmVnaXN0ZXJzKCkpOwogICAgIHBhdGNo cG9pbnQtPnNldEdlbmVyYXRvcihbPV0gKENDYWxsSGVscGVycyYgaml0LCBjb25zdCBTdGFja21h cEdlbmVyYXRpb25QYXJhbXMmIHBhcmFtcykgewogICAgICAgICBBbGxvd01hY3JvU2NyYXRjaFJl Z2lzdGVyVXNhZ2UgYWxsb3dTY3JhdGNoKGppdCk7CiAjaWYgQ1BVKFg4Nl82NCkKQEAgLTE2Mjks NiArMTYzMCw3IEBAIGF1dG8gQjNJUkdlbmVyYXRvcjo6YWRkT3A8T3BUeXBlOjpGMzJDb24KICAg ICBpZiAoaXNYODYoKSkKICAgICAgICAgcGF0Y2hwb2ludC0+bnVtR1BTY3JhdGNoUmVnaXN0ZXJz ID0gMTsKICAgICBwYXRjaHBvaW50LT5hcHBlbmQoQ29uc3RyYWluZWRWYWx1ZShhcmcsIFZhbHVl UmVwOjpTb21lUmVnaXN0ZXIpKTsKKyAgICBwYXRjaHBvaW50LT5jbG9iYmVyKFJlZ2lzdGVyU2V0 OjptYWNyb1NjcmF0Y2hSZWdpc3RlcnMoKSk7CiAgICAgcGF0Y2hwb2ludC0+c2V0R2VuZXJhdG9y KFs9XSAoQ0NhbGxIZWxwZXJzJiBqaXQsIGNvbnN0IFN0YWNrbWFwR2VuZXJhdGlvblBhcmFtcyYg cGFyYW1zKSB7CiAgICAgICAgIEFsbG93TWFjcm9TY3JhdGNoUmVnaXN0ZXJVc2FnZSBhbGxvd1Nj cmF0Y2goaml0KTsKICNpZiBDUFUoWDg2XzY0KQpAQCAtMTgzOCw3ICsxODQwLDcgQEAgYXV0byBC M0lSR2VuZXJhdG9yOjphZGRPcDxPcFR5cGU6Okk2NFRydQogICAgICAgICBwYXRjaHBvaW50LT5u dW1GUFNjcmF0Y2hSZWdpc3RlcnMgPSAxOwogICAgIH0KICAgICBwYXRjaHBvaW50LT5zZXRHZW5l cmF0b3IoWz1dIChDQ2FsbEhlbHBlcnMmIGppdCwgY29uc3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFy YW1zJiBwYXJhbXMpIHsKLSAgICAgICAgQWxsb3dNYWNyb1NjcmF0Y2hSZWdpc3RlclVzYWdlIGFs bG93U2NyYXRjaChqaXQpOworICAgICAgICBBbGxvd01hY3JvU2NyYXRjaFJlZ2lzdGVyVXNhZ2Ug YWxsb3dTY3JhdGNoKGppdCk7IC8vIE9PUFM6IFRoaXMgbG9va3Mgc3VwZXIgd3JvbmcgZ2l2ZW4g d2UgZG9uJ3Qgc2F5IHdlIGNsb2JiZXIgdGhpcyEKICAgICAgICAgRlBSUmVnIHNjcmF0Y2ggPSBJ bnZhbGlkRlBSUmVnOwogICAgICAgICBGUFJSZWcgY29uc3RhbnQgPSBJbnZhbGlkRlBSUmVnOwog ICAgICAgICBpZiAoaXNYODYoKSkgewo= 362240 2019-02-17 11:58:23 -0800 2019-02-17 20:40:19 -0800 patch b-backup.diff text/plain 5212 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQxNjUxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDE5LTAyLTE3ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFdhc21CM0lSR2VuZXJhdG9yIG1vZGVscyBzb21lIGVmZmVjdHMgaW5jb3JyZWN0bHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDAzOAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2FzbS9XYXNtQjNJ UkdlbmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6Oldhc206OkIzSVJHZW5lcmF0b3I6OnJlc3Rv cmVXYXNtQ29udGV4dEluc3RhbmNlKToKKyAgICAgICAgKEpTQzo6V2FzbTo6QjNJUkdlbmVyYXRv cjo6cmVzdG9yZVdlYkFzc2VtYmx5R2xvYmFsU3RhdGUpOgorICAgICAgICBUaGVzZSB0d28gZnVu Y3Rpb25zIHdlcmUgdXNpbmcgZ2xvYmFsIHN0YXRlIGluc3RlYWQgb2YgdGhlCisgICAgICAgIGFy Z3VtZW50cyBwYXNzZWQgaW50byB0aGUgZnVuY3Rpb24uCisKKyAgICAgICAgKEpTQzo6V2FzbTo6 QjNJUkdlbmVyYXRvcjo6YWRkT3A8RjY0Q29udmVydFVJNjQ+KToKKyAgICAgICAgKEpTQzo6V2Fz bTo6QjNJUkdlbmVyYXRvcjo6YWRkT3A8T3BUeXBlOjpGMzJDb252ZXJ0VUk2ND4pOgorICAgICAg ICAoSlNDOjpXYXNtOjpCM0lSR2VuZXJhdG9yOjphZGRPcDxPcFR5cGU6Okk2NFRydW5jVUY2ND4p OgorICAgICAgICAoSlNDOjpXYXNtOjpCM0lSR2VuZXJhdG9yOjphZGRPcDxPcFR5cGU6Okk2NFRy dW5jVUYzMj4pOgorICAgICAgICBBbnkgcGF0Y2hwb2ludCB0aGF0IGFsbG93cyBzY3JhdGNoIHJl Z2lzdGVyIHVzYWdlIG11c3QKKyAgICAgICAgYWxzbyBzYXkgdGhhdCBpdCBjbG9iYmVycyB0aGUg c2NyYXRjaCByZWdpc3RlcnMuCisKIDIwMTktMDItMTcgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1x dWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDE2 MTIuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtQjNJUkdlbmVyYXRvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUIzSVJHZW5l cmF0b3IuY3BwCShyZXZpc2lvbiAyNDE2NTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2Fz bS9XYXNtQjNJUkdlbmVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxNyw3ICszMTcsNyBA QCB2b2lkIEIzSVJHZW5lcmF0b3I6OnJlc3RvcmVXYXNtQ29udGV4dEluCiAgICAgZWZmZWN0cy5y ZWFkcyA9IEIzOjpIZWFwUmFuZ2U6OnRvcCgpOwogICAgIHBhdGNocG9pbnQtPmVmZmVjdHMgPSBl ZmZlY3RzOwogICAgIHBhdGNocG9pbnQtPmNsb2JiZXJMYXRlKFJlZ2lzdGVyU2V0KG1fd2FzbUNv bnRleHRJbnN0YW5jZUdQUikpOwotICAgIHBhdGNocG9pbnQtPmFwcGVuZChpbnN0YW5jZVZhbHVl KCksIFZhbHVlUmVwOjpTb21lUmVnaXN0ZXIpOworICAgIHBhdGNocG9pbnQtPmFwcGVuZChhcmcs IFZhbHVlUmVwOjpTb21lUmVnaXN0ZXIpOwogICAgIEdQUlJlZyB3YXNtQ29udGV4dEluc3RhbmNl R1BSID0gbV93YXNtQ29udGV4dEluc3RhbmNlR1BSOwogICAgIHBhdGNocG9pbnQtPnNldEdlbmVy YXRvcihbPV0gKENDYWxsSGVscGVycyYgaml0LCBjb25zdCBTdGFja21hcEdlbmVyYXRpb25QYXJh bXMmIHBhcmFtKSB7CiAgICAgICAgIGppdC5tb3ZlKHBhcmFtWzBdLmdwcigpLCB3YXNtQ29udGV4 dEluc3RhbmNlR1BSKTsKQEAgLTQ2MSw5ICs0NjEsOSBAQCB2b2lkIEIzSVJHZW5lcmF0b3I6OnJl c3RvcmVXZWJBc3NlbWJseUdsCiAKICAgICBpZiAocmVzdG9yZUNhY2hlZFN0YWNrTGltaXQgPT0g UmVzdG9yZUNhY2hlZFN0YWNrTGltaXQ6OlllcykgewogICAgICAgICAvLyBUaGUgSW5zdGFuY2Ug Y2FjaGVzIHRoZSBzdGFjayBsaW1pdCwgYnV0IGFsc28ga25vd3Mgd2hlcmUgaXRzIGNhbm9uaWNh bCBsb2NhdGlvbiBpcy4KLSAgICAgICAgVmFsdWUqIHBvaW50ZXJUb0FjdHVhbFN0YWNrTGltaXQg PSBtX2N1cnJlbnRCbG9jay0+YXBwZW5kTmV3PE1lbW9yeVZhbHVlPihtX3Byb2MsIExvYWQsIHBv aW50ZXJUeXBlKCksIG9yaWdpbigpLCBpbnN0YW5jZVZhbHVlKCksIHNhZmVDYXN0PGludDMyX3Q+ KEluc3RhbmNlOjpvZmZzZXRPZlBvaW50ZXJUb0FjdHVhbFN0YWNrTGltaXQoKSkpOwotICAgICAg ICBWYWx1ZSogYWN0dWFsU3RhY2tMaW1pdCA9IG1fY3VycmVudEJsb2NrLT5hcHBlbmROZXc8TWVt b3J5VmFsdWU+KG1fcHJvYywgTG9hZCwgcG9pbnRlclR5cGUoKSwgb3JpZ2luKCksIHBvaW50ZXJU b0FjdHVhbFN0YWNrTGltaXQpOwotICAgICAgICBtX2N1cnJlbnRCbG9jay0+YXBwZW5kTmV3PE1l bW9yeVZhbHVlPihtX3Byb2MsIFN0b3JlLCBvcmlnaW4oKSwgYWN0dWFsU3RhY2tMaW1pdCwgaW5z dGFuY2VWYWx1ZSgpLCBzYWZlQ2FzdDxpbnQzMl90PihJbnN0YW5jZTo6b2Zmc2V0T2ZDYWNoZWRT dGFja0xpbWl0KCkpKTsKKyAgICAgICAgVmFsdWUqIHBvaW50ZXJUb0FjdHVhbFN0YWNrTGltaXQg PSBibG9jay0+YXBwZW5kTmV3PE1lbW9yeVZhbHVlPihtX3Byb2MsIExvYWQsIHBvaW50ZXJUeXBl KCksIG9yaWdpbigpLCBpbnN0YW5jZVZhbHVlKCksIHNhZmVDYXN0PGludDMyX3Q+KEluc3RhbmNl OjpvZmZzZXRPZlBvaW50ZXJUb0FjdHVhbFN0YWNrTGltaXQoKSkpOworICAgICAgICBWYWx1ZSog YWN0dWFsU3RhY2tMaW1pdCA9IGJsb2NrLT5hcHBlbmROZXc8TWVtb3J5VmFsdWU+KG1fcHJvYywg TG9hZCwgcG9pbnRlclR5cGUoKSwgb3JpZ2luKCksIHBvaW50ZXJUb0FjdHVhbFN0YWNrTGltaXQp OworICAgICAgICBibG9jay0+YXBwZW5kTmV3PE1lbW9yeVZhbHVlPihtX3Byb2MsIFN0b3JlLCBv cmlnaW4oKSwgYWN0dWFsU3RhY2tMaW1pdCwgaW5zdGFuY2VWYWx1ZSgpLCBzYWZlQ2FzdDxpbnQz Ml90PihJbnN0YW5jZTo6b2Zmc2V0T2ZDYWNoZWRTdGFja0xpbWl0KCkpKTsKICAgICB9CiAKICAg ICBpZiAoISFtZW1vcnkpIHsKQEAgLTE2MTAsNiArMTYxMCw3IEBAIGF1dG8gQjNJUkdlbmVyYXRv cjo6YWRkT3A8RjY0Q29udmVydFVJNjQKICAgICBQYXRjaHBvaW50VmFsdWUqIHBhdGNocG9pbnQg PSBtX2N1cnJlbnRCbG9jay0+YXBwZW5kTmV3PFBhdGNocG9pbnRWYWx1ZT4obV9wcm9jLCBEb3Vi bGUsIG9yaWdpbigpKTsKICAgICBpZiAoaXNYODYoKSkKICAgICAgICAgcGF0Y2hwb2ludC0+bnVt R1BTY3JhdGNoUmVnaXN0ZXJzID0gMTsKKyAgICBwYXRjaHBvaW50LT5jbG9iYmVyKFJlZ2lzdGVy U2V0OjptYWNyb1NjcmF0Y2hSZWdpc3RlcnMoKSk7CiAgICAgcGF0Y2hwb2ludC0+YXBwZW5kKENv bnN0cmFpbmVkVmFsdWUoYXJnLCBWYWx1ZVJlcDo6U29tZVJlZ2lzdGVyKSk7CiAgICAgcGF0Y2hw b2ludC0+c2V0R2VuZXJhdG9yKFs9XSAoQ0NhbGxIZWxwZXJzJiBqaXQsIGNvbnN0IFN0YWNrbWFw R2VuZXJhdGlvblBhcmFtcyYgcGFyYW1zKSB7CiAgICAgICAgIEFsbG93TWFjcm9TY3JhdGNoUmVn aXN0ZXJVc2FnZSBhbGxvd1NjcmF0Y2goaml0KTsKQEAgLTE2MzAsNiArMTYzMSw3IEBAIGF1dG8g QjNJUkdlbmVyYXRvcjo6YWRkT3A8T3BUeXBlOjpGMzJDb24KICAgICBQYXRjaHBvaW50VmFsdWUq IHBhdGNocG9pbnQgPSBtX2N1cnJlbnRCbG9jay0+YXBwZW5kTmV3PFBhdGNocG9pbnRWYWx1ZT4o bV9wcm9jLCBGbG9hdCwgb3JpZ2luKCkpOwogICAgIGlmIChpc1g4NigpKQogICAgICAgICBwYXRj aHBvaW50LT5udW1HUFNjcmF0Y2hSZWdpc3RlcnMgPSAxOworICAgIHBhdGNocG9pbnQtPmNsb2Ji ZXIoUmVnaXN0ZXJTZXQ6Om1hY3JvU2NyYXRjaFJlZ2lzdGVycygpKTsKICAgICBwYXRjaHBvaW50 LT5hcHBlbmQoQ29uc3RyYWluZWRWYWx1ZShhcmcsIFZhbHVlUmVwOjpTb21lUmVnaXN0ZXIpKTsK ICAgICBwYXRjaHBvaW50LT5zZXRHZW5lcmF0b3IoWz1dIChDQ2FsbEhlbHBlcnMmIGppdCwgY29u c3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMpIHsKICAgICAgICAgQWxsb3dNYWNy b1NjcmF0Y2hSZWdpc3RlclVzYWdlIGFsbG93U2NyYXRjaChqaXQpOwpAQCAtMTgzOSw2ICsxODQx LDcgQEAgYXV0byBCM0lSR2VuZXJhdG9yOjphZGRPcDxPcFR5cGU6Okk2NFRydQogICAgICAgICBw YXRjaHBvaW50LT5hcHBlbmQoc2lnbkJpdENvbnN0YW50LCBWYWx1ZVJlcDo6U29tZVJlZ2lzdGVy KTsKICAgICAgICAgcGF0Y2hwb2ludC0+bnVtRlBTY3JhdGNoUmVnaXN0ZXJzID0gMTsKICAgICB9 CisgICAgcGF0Y2hwb2ludC0+Y2xvYmJlcihSZWdpc3RlclNldDo6bWFjcm9TY3JhdGNoUmVnaXN0 ZXJzKCkpOwogICAgIHBhdGNocG9pbnQtPnNldEdlbmVyYXRvcihbPV0gKENDYWxsSGVscGVycyYg aml0LCBjb25zdCBTdGFja21hcEdlbmVyYXRpb25QYXJhbXMmIHBhcmFtcykgewogICAgICAgICBB bGxvd01hY3JvU2NyYXRjaFJlZ2lzdGVyVXNhZ2UgYWxsb3dTY3JhdGNoKGppdCk7CiAgICAgICAg IEZQUlJlZyBzY3JhdGNoID0gSW52YWxpZEZQUlJlZzsKQEAgLTE5MDQsNiArMTkwNyw3IEBAIGF1 dG8gQjNJUkdlbmVyYXRvcjo6YWRkT3A8T3BUeXBlOjpJNjRUcnUKICAgICAgICAgcGF0Y2hwb2lu dC0+YXBwZW5kKHNpZ25CaXRDb25zdGFudCwgVmFsdWVSZXA6OlNvbWVSZWdpc3Rlcik7CiAgICAg ICAgIHBhdGNocG9pbnQtPm51bUZQU2NyYXRjaFJlZ2lzdGVycyA9IDE7CiAgICAgfQorICAgIHBh dGNocG9pbnQtPmNsb2JiZXIoUmVnaXN0ZXJTZXQ6Om1hY3JvU2NyYXRjaFJlZ2lzdGVycygpKTsK ICAgICBwYXRjaHBvaW50LT5zZXRHZW5lcmF0b3IoWz1dIChDQ2FsbEhlbHBlcnMmIGppdCwgY29u c3QgU3RhY2ttYXBHZW5lcmF0aW9uUGFyYW1zJiBwYXJhbXMpIHsKICAgICAgICAgQWxsb3dNYWNy b1NjcmF0Y2hSZWdpc3RlclVzYWdlIGFsbG93U2NyYXRjaChqaXQpOwogICAgICAgICBGUFJSZWcg c2NyYXRjaCA9IEludmFsaWRGUFJSZWc7Cg==