200681 2019-08-13 11:45:58 -0700 [WHLSL] Don't generate empty comma expressions for bare ';' 2019-08-13 18:06:21 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 199726 1 rmorisset rmorisset commit-queue ews-watchlist mmaxfield webkit-bug-importer oldest_to_newest 1560880 0 rmorisset 2019-08-13 11:45:58 -0700 Currently we emit a comma expression with no sub-expression for bare ';', as well as for the initialization of for loops with no initializers. This crashes the Checker, as it tries to access the last sub-expression of comma expressions. Instead we should generate an empty statement block for that case. This problem was found (and originally fixed before the commit was reverted) in https://bugs.webkit.org/show_bug.cgi?id=199726. I am just isolating the fix here for easier review and debugging. 1560882 1 376189 rmorisset 2019-08-13 11:49:31 -0700 Created attachment 376189 Patch 1561025 2 376189 commit-queue 2019-08-13 18:05:33 -0700 Comment on attachment 376189 Patch Clearing flags on attachment: 376189 Committed r248650: <https://trac.webkit.org/changeset/248650> 1561026 3 commit-queue 2019-08-13 18:05:35 -0700 All reviewed patches have been landed. Closing bug. 1561027 4 webkit-bug-importer 2019-08-13 18:06:21 -0700 <rdar://problem/54282997> 376189 2019-08-13 11:49:31 -0700 2019-08-13 18:05:33 -0700 Patch patch200681 text/plain 10904 rmorisset ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NmVjYWRjMDJhMS4uNWI0N2RiNTU1ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxOS0wOC0xMyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFtXSExTTF0gRG9uJ3QgZ2VuZXJhdGUgZW1wdHkgY29tbWEgZXhwcmVz c2lvbnMgZm9yIGJhcmUgJzsnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDA2ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDdXJyZW50bHkgd2UgZW1pdCBhIGNvbW1hIGV4cHJlc3Npb24gd2l0aCBubyBz dWItZXhwcmVzc2lvbiBmb3IgYmFyZSAnOycsIGFzIHdlbGwgYXMgZm9yIHRoZSBpbml0aWFsaXph dGlvbiBvZiBmb3IgbG9vcHMgd2l0aCBubyBpbml0aWFsaXplcnMuCisgICAgICAgIFRoaXMgY3Jh c2hlcyB0aGUgQ2hlY2tlciwgYXMgaXQgdHJpZXMgdG8gYWNjZXNzIHRoZSBsYXN0IHN1Yi1leHBy ZXNzaW9uIG9mIGNvbW1hIGV4cHJlc3Npb25zLgorICAgICAgICBJbnN0ZWFkIHdlIHNob3VsZCBn ZW5lcmF0ZSBhbiBlbXB0eSBzdGF0ZW1lbnQgYmxvY2sgZm9yIHRoYXQgY2FzZS4KKworICAgICAg ICBUaGlzIHByb2JsZW0gd2FzIGZvdW5kIChhbmQgb3JpZ2luYWxseSBmaXhlZCBiZWZvcmUgdGhl IGNvbW1pdCB3YXMgcmV2ZXJ0ZWQpIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTk3MjYuCisgICAgICAgIEkgYW0ganVzdCBpc29sYXRpbmcgdGhlIGZpeCBoZXJl IGZvciBlYXNpZXIgcmV2aWV3IGFuZCBkZWJ1Z2dpbmcuCisKKyAgICAgICAgTmV3IHRlc3Q6IExh eW91dFRlc3RzL3dlYmdwdS93aGxzbC9mb3ItbG9vcC5odG1sCisKKyAgICAgICAgKiBNb2R1bGVz L3dlYmdwdS9XSExTTC9BU1QvV0hMU0xGb3JMb29wLmg6CisgICAgICAgICogTW9kdWxlcy93ZWJn cHUvV0hMU0wvTWV0YWwvV0hMU0xGdW5jdGlvbldyaXRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpXSExTTDo6TWV0YWw6OkZ1bmN0aW9uRGVmaW5pdGlvbldyaXRlcjo6dmlzaXQpOgorICAgICAg ICAqIE1vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMQVNURHVtcGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OldITFNMOjpBU1REdW1wZXI6OnZpc2l0KToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdw dS9XSExTTC9XSExTTENoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V0hMU0w6OkNoZWNr ZXI6OnZpc2l0KToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBhcnNlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpXSExTTDo6UGFyc2VyOjpwYXJzZUZvckxvb3ApOgorICAg ICAgICAoV2ViQ29yZTo6V0hMU0w6OlBhcnNlcjo6cGFyc2VTdGF0ZW1lbnQpOgorICAgICAgICAo V2ViQ29yZTo6V0hMU0w6OlBhcnNlcjo6cGFyc2VFZmZlY3RmdWxFeHByZXNzaW9uKToKKyAgICAg ICAgKiBNb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBhcnNlci5oOgorICAgICAgICAqIE1vZHVs ZXMvd2ViZ3B1L1dITFNML1dITFNMVmlzaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXSExT TDo6VmlzaXRvcjo6dmlzaXQpOgorCiAyMDE5LTA4LTEyICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJv ICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV1bR1RLXSBGaXggYnVpbGRpbmcg d2l0aG91dCB1bmlmaWVkIHNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEZvckxvb3AuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEZvckxvb3AuaAppbmRleCAwYTdlNmY4ZWU1MS4uM2U3 MDU3ZDcxYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNM L0FTVC9XSExTTEZvckxvb3AuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9X SExTTC9BU1QvV0hMU0xGb3JMb29wLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgbmFtZXNwYWNlIEFTVCB7 CiBjbGFzcyBGb3JMb29wIGZpbmFsIDogcHVibGljIFN0YXRlbWVudCB7CiAgICAgV1RGX01BS0Vf RkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgRm9yTG9vcChDb2RlTG9jYXRpb24gbG9jYXRp b24sIFZhcmlhbnQ8VW5pcXVlUmVmPFN0YXRlbWVudD4sIFVuaXF1ZVJlZjxFeHByZXNzaW9uPj4m JiBpbml0aWFsaXphdGlvbiwgc3RkOjp1bmlxdWVfcHRyPEV4cHJlc3Npb24+JiYgY29uZGl0aW9u LCBzdGQ6OnVuaXF1ZV9wdHI8RXhwcmVzc2lvbj4mJiBpbmNyZW1lbnQsIFVuaXF1ZVJlZjxTdGF0 ZW1lbnQ+JiYgYm9keSkKKyAgICBGb3JMb29wKENvZGVMb2NhdGlvbiBsb2NhdGlvbiwgVW5pcXVl UmVmPFN0YXRlbWVudD4mJiBpbml0aWFsaXphdGlvbiwgc3RkOjp1bmlxdWVfcHRyPEV4cHJlc3Np b24+JiYgY29uZGl0aW9uLCBzdGQ6OnVuaXF1ZV9wdHI8RXhwcmVzc2lvbj4mJiBpbmNyZW1lbnQs IFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+JiYgYm9keSkKICAgICAgICAgOiBTdGF0ZW1lbnQobG9jYXRp b24sIEtpbmQ6OkZvckxvb3ApCiAgICAgICAgICwgbV9pbml0aWFsaXphdGlvbihXVEZNb3ZlKGlu aXRpYWxpemF0aW9uKSkKICAgICAgICAgLCBtX2NvbmRpdGlvbihXVEZNb3ZlKGNvbmRpdGlvbikp CkBAIC01OSwxMyArNTksMTMgQEAgcHVibGljOgogICAgIEZvckxvb3AoY29uc3QgRm9yTG9vcCYp ID0gZGVsZXRlOwogICAgIEZvckxvb3AoRm9yTG9vcCYmKSA9IGRlZmF1bHQ7CiAKLSAgICBWYXJp YW50PFVuaXF1ZVJlZjxTdGF0ZW1lbnQ+LCBVbmlxdWVSZWY8RXhwcmVzc2lvbj4+JiBpbml0aWFs aXphdGlvbigpIHsgcmV0dXJuIG1faW5pdGlhbGl6YXRpb247IH0KKyAgICBVbmlxdWVSZWY8U3Rh dGVtZW50PiYgaW5pdGlhbGl6YXRpb24oKSB7IHJldHVybiBtX2luaXRpYWxpemF0aW9uOyB9CiAg ICAgRXhwcmVzc2lvbiogY29uZGl0aW9uKCkgeyByZXR1cm4gbV9jb25kaXRpb24uZ2V0KCk7IH0K ICAgICBFeHByZXNzaW9uKiBpbmNyZW1lbnQoKSB7IHJldHVybiBtX2luY3JlbWVudC5nZXQoKTsg fQogICAgIFN0YXRlbWVudCYgYm9keSgpIHsgcmV0dXJuIG1fYm9keTsgfQogCiBwcml2YXRlOgot ICAgIFZhcmlhbnQ8VW5pcXVlUmVmPFN0YXRlbWVudD4sIFVuaXF1ZVJlZjxFeHByZXNzaW9uPj4g bV9pbml0aWFsaXphdGlvbjsKKyAgICBVbmlxdWVSZWY8U3RhdGVtZW50PiBtX2luaXRpYWxpemF0 aW9uOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxFeHByZXNzaW9uPiBtX2NvbmRpdGlvbjsKICAgICBz dGQ6OnVuaXF1ZV9wdHI8RXhwcmVzc2lvbj4gbV9pbmNyZW1lbnQ7CiAgICAgVW5pcXVlUmVmPFN0 YXRlbWVudD4gbV9ib2R5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJn cHUvV0hMU0wvTWV0YWwvV0hMU0xGdW5jdGlvbldyaXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTEZ1bmN0aW9uV3JpdGVyLmNwcAppbmRleCBj YTM0NmUzMmIyOS4uODI1NDhiOGM2ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIu Y3BwCkBAIC0zNTYsMTQgKzM1Niw3IEBAIHZvaWQgRnVuY3Rpb25EZWZpbml0aW9uV3JpdGVyOjp2 aXNpdChBU1Q6OldoaWxlTG9vcCYgd2hpbGVMb29wKQogdm9pZCBGdW5jdGlvbkRlZmluaXRpb25X cml0ZXI6OnZpc2l0KEFTVDo6Rm9yTG9vcCYgZm9yTG9vcCkKIHsKICAgICBtX3N0cmluZ0J1aWxk ZXIuYXBwZW5kKCJ7XG4iKTsKLQotICAgIFdURjo6dmlzaXQoV1RGOjptYWtlVmlzaXRvcihbJl0o QVNUOjpTdGF0ZW1lbnQmIHN0YXRlbWVudCkgewotICAgICAgICBjaGVja0Vycm9yQW5kVmlzaXQo c3RhdGVtZW50KTsKLSAgICB9LCBbJl0oVW5pcXVlUmVmPEFTVDo6RXhwcmVzc2lvbj4mIGV4cHJl c3Npb24pIHsKLSAgICAgICAgY2hlY2tFcnJvckFuZFZpc2l0KGV4cHJlc3Npb24pOwotICAgICAg ICB0YWtlTGFzdFZhbHVlKCk7IC8vIFdlIGRvbid0IG5lZWQgdG8gZG8gYW55dGhpbmcgd2l0aCB0 aGUgcmVzdWx0LgotICAgIH0pLCBmb3JMb29wLmluaXRpYWxpemF0aW9uKCkpOwotCisgICAgY2hl Y2tFcnJvckFuZFZpc2l0KGZvckxvb3AuaW5pdGlhbGl6YXRpb24oKSk7CiAgICAgZW1pdExvb3Ao TG9vcENvbmRpdGlvbkxvY2F0aW9uOjpCZWZvcmVCb2R5LCBmb3JMb29wLmNvbmRpdGlvbigpLCBm b3JMb29wLmluY3JlbWVudCgpLCBmb3JMb29wLmJvZHkoKSk7CiAgICAgbV9zdHJpbmdCdWlsZGVy LmFwcGVuZCgifVxuIik7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmdwdS9XSExTTC9XSExTTEFTVER1bXBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmdwdS9XSExTTC9XSExTTEFTVER1bXBlci5jcHAKaW5kZXggZDIwMTI4YWY4NmIuLjM5NmY4NGY3 NmY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExT TEFTVER1bXBlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wv V0hMU0xBU1REdW1wZXIuY3BwCkBAIC00MDksMTEgKzQwOSw3IEBAIHZvaWQgQVNURHVtcGVyOjp2 aXNpdChBU1Q6OkRvV2hpbGVMb29wJiBkb1doaWxlTG9vcCkKIHZvaWQgQVNURHVtcGVyOjp2aXNp dChBU1Q6OkZvckxvb3AmIGZvckxvb3ApCiB7CiAgICAgbV9vdXQucHJpbnQoImZvciAoIik7Ci0g ICAgV1RGOjp2aXNpdChXVEY6Om1ha2VWaXNpdG9yKFsmXShVbmlxdWVSZWY8QVNUOjpTdGF0ZW1l bnQ+JiBzdGF0ZW1lbnQpIHsKLSAgICAgICAgdmlzaXQoc3RhdGVtZW50KTsKLSAgICB9LCBbJl0o VW5pcXVlUmVmPEFTVDo6RXhwcmVzc2lvbj4mIGV4cHJlc3Npb24pIHsKLSAgICAgICAgdmlzaXQo ZXhwcmVzc2lvbik7Ci0gICAgfSksIGZvckxvb3AuaW5pdGlhbGl6YXRpb24oKSk7CisgICAgdmlz aXQoZm9yTG9vcC5pbml0aWFsaXphdGlvbigpKTsKICAgICBtX291dC5wcmludCgiOyAiKTsKICAg ICBpZiAoZm9yTG9vcC5jb25kaXRpb24oKSkKICAgICAgICAgdmlzaXQoKmZvckxvb3AuY29uZGl0 aW9uKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wv V0hMU0xDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dI TFNMQ2hlY2tlci5jcHAKaW5kZXggMzMzYmRmNjJjMDIuLjc3ZGE0OGUyZWNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTENoZWNrZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMQ2hlY2tlci5jcHAK QEAgLTE0NDMsMTEgKzE0NDMsNyBAQCB2b2lkIENoZWNrZXI6OnZpc2l0KEFTVDo6RG9XaGlsZUxv b3AmIGRvV2hpbGVMb29wKQogCiB2b2lkIENoZWNrZXI6OnZpc2l0KEFTVDo6Rm9yTG9vcCYgZm9y TG9vcCkKIHsKLSAgICBXVEY6OnZpc2l0KFdURjo6bWFrZVZpc2l0b3IoWyZdKFVuaXF1ZVJlZjxB U1Q6OlN0YXRlbWVudD4mIHN0YXRlbWVudCkgewotICAgICAgICBjaGVja0Vycm9yQW5kVmlzaXQo c3RhdGVtZW50KTsKLSAgICB9LCBbJl0oVW5pcXVlUmVmPEFTVDo6RXhwcmVzc2lvbj4mIGV4cHJl c3Npb24pIHsKLSAgICAgICAgY2hlY2tFcnJvckFuZFZpc2l0KGV4cHJlc3Npb24pOwotICAgIH0p LCBmb3JMb29wLmluaXRpYWxpemF0aW9uKCkpOworICAgIGNoZWNrRXJyb3JBbmRWaXNpdChmb3JM b29wLmluaXRpYWxpemF0aW9uKCkpOwogICAgIGlmIChoYXNFcnJvcigpKQogICAgICAgICByZXR1 cm47CiAgICAgaWYgKGZvckxvb3AuY29uZGl0aW9uKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUGFyc2VyLmNwcAppbmRleCA3Y2FiNmM5NWVj My4uMDE2MTE0YTYxMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1 L1dITFNML1dITFNMUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdw dS9XSExTTC9XSExTTFBhcnNlci5jcHAKQEAgLTExNjMsNyArMTE2Myw3IEBAIGF1dG8gUGFyc2Vy OjpwYXJzZUZvckxvb3AoKSAtPiBFeHBlY3RlZDxBU1Q6OkZvckxvb3AsIEVycm9yPgogICAgIENP TlNVTUVfVFlQRShvcmlnaW4sIEZvcik7CiAgICAgQ09OU1VNRV9UWVBFKGxlZnRQYXJlbnRoZXNp cywgTGVmdFBhcmVudGhlc2lzKTsKIAotICAgIGF1dG8gcGFyc2VSZW1haW5kZXIgPSBbJl0oVmFy aWFudDxVbmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+LCBVbmlxdWVSZWY8QVNUOjpFeHByZXNzaW9u Pj4mJiBpbml0aWFsaXphdGlvbikgLT4gRXhwZWN0ZWQ8QVNUOjpGb3JMb29wLCBFcnJvcj4gewor ICAgIGF1dG8gcGFyc2VSZW1haW5kZXIgPSBbJl0oVW5pcXVlUmVmPEFTVDo6U3RhdGVtZW50PiYm IGluaXRpYWxpemF0aW9uKSAtPiBFeHBlY3RlZDxBU1Q6OkZvckxvb3AsIEVycm9yPiB7CiAgICAg ICAgIENPTlNVTUVfVFlQRShzZW1pY29sb24sIFNlbWljb2xvbik7CiAKICAgICAgICAgc3RkOjp1 bmlxdWVfcHRyPEFTVDo6RXhwcmVzc2lvbj4gY29uZGl0aW9uKG51bGxwdHIpOwpAQCAtMTM1Niwx MyArMTM1NiwxMyBAQCBhdXRvIFBhcnNlcjo6cGFyc2VTdGF0ZW1lbnQoKSAtPiBFeHBlY3RlZDxV bmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+LCBFcnJvcj4KICAgICB9CiAKICAgICB7Ci0gICAgICAg IGF1dG8gZWZmZWN0ZnVsRXhwcmVzc2lvbiA9IGJhY2t0cmFja2luZ1Njb3BlPEV4cGVjdGVkPFVu aXF1ZVJlZjxBU1Q6OkV4cHJlc3Npb24+LCBFcnJvcj4+KFsmXSgpIC0+IEV4cGVjdGVkPFVuaXF1 ZVJlZjxBU1Q6OkV4cHJlc3Npb24+LCBFcnJvcj4geworICAgICAgICBhdXRvIGVmZmVjdGZ1bEV4 cHJlc3Npb24gPSBiYWNrdHJhY2tpbmdTY29wZTxFeHBlY3RlZDxVbmlxdWVSZWY8QVNUOjpTdGF0 ZW1lbnQ+LCBFcnJvcj4+KFsmXSgpIC0+IEV4cGVjdGVkPFVuaXF1ZVJlZjxBU1Q6OlN0YXRlbWVu dD4sIEVycm9yPiB7CiAgICAgICAgICAgICBQQVJTRShyZXN1bHQsIEVmZmVjdGZ1bEV4cHJlc3Np b24pOwogICAgICAgICAgICAgQ09OU1VNRV9UWVBFKHNlbWljb2xvbiwgU2VtaWNvbG9uKTsKICAg ICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgICAgIH0pOwogICAgICAgICBpZiAoZWZmZWN0 ZnVsRXhwcmVzc2lvbikKLSAgICAgICAgICAgIHJldHVybiB7IG1ha2VVbmlxdWVSZWY8QVNUOjpF ZmZlY3RmdWxFeHByZXNzaW9uU3RhdGVtZW50PihXVEZNb3ZlKCplZmZlY3RmdWxFeHByZXNzaW9u KSkgfTsKKyAgICAgICAgICAgIHJldHVybiBXVEZNb3ZlKCplZmZlY3RmdWxFeHByZXNzaW9uKTsK ICAgICB9CiAKICAgICBQQVJTRSh2YXJpYWJsZURlY2xhcmF0aW9ucywgVmFyaWFibGVEZWNsYXJh dGlvbnMpOwpAQCAtMTM3MCwxMyArMTM3MCwxMyBAQCBhdXRvIFBhcnNlcjo6cGFyc2VTdGF0ZW1l bnQoKSAtPiBFeHBlY3RlZDxVbmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+LCBFcnJvcj4KICAgICBy ZXR1cm4geyBtYWtlVW5pcXVlUmVmPEFTVDo6VmFyaWFibGVEZWNsYXJhdGlvbnNTdGF0ZW1lbnQ+ KFdURk1vdmUoKnZhcmlhYmxlRGVjbGFyYXRpb25zKSkgfTsKIH0KIAotYXV0byBQYXJzZXI6OnBh cnNlRWZmZWN0ZnVsRXhwcmVzc2lvbigpIC0+IEV4cGVjdGVkPFVuaXF1ZVJlZjxBU1Q6OkV4cHJl c3Npb24+LCBFcnJvcj4KK2F1dG8gUGFyc2VyOjpwYXJzZUVmZmVjdGZ1bEV4cHJlc3Npb24oKSAt PiBFeHBlY3RlZDxVbmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+LCBFcnJvcj4KIHsKICAgICBQRUVL KG9yaWdpbik7Ci0gICAgVmVjdG9yPFVuaXF1ZVJlZjxBU1Q6OkV4cHJlc3Npb24+PiBleHByZXNz aW9uczsKICAgICBpZiAob3JpZ2luLT50eXBlID09IFRva2VuOjpUeXBlOjpTZW1pY29sb24pCi0g ICAgICAgIHJldHVybiB7IG1ha2VVbmlxdWVSZWY8QVNUOjpDb21tYUV4cHJlc3Npb24+KCpvcmln aW4sIFdURk1vdmUoZXhwcmVzc2lvbnMpKSB9OworICAgICAgICByZXR1cm4geyBtYWtlVW5pcXVl UmVmPEFTVDo6QmxvY2s+KCpvcmlnaW4sIFZlY3RvcjxVbmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+ PigpKSB9OwogCisgICAgVmVjdG9yPFVuaXF1ZVJlZjxBU1Q6OkV4cHJlc3Npb24+PiBleHByZXNz aW9uczsKICAgICBQQVJTRShlZmZlY3RmdWxFeHByZXNzaW9uLCBFZmZlY3RmdWxBc3NpZ25tZW50 KTsKICAgICBleHByZXNzaW9ucy5hcHBlbmQoV1RGTW92ZSgqZWZmZWN0ZnVsRXhwcmVzc2lvbikp OwogCkBAIC0xMzg2LDEwICsxMzg2LDExIEBAIGF1dG8gUGFyc2VyOjpwYXJzZUVmZmVjdGZ1bEV4 cHJlc3Npb24oKSAtPiBFeHBlY3RlZDxVbmlxdWVSZWY8QVNUOjpFeHByZXNzaW9uPiwKICAgICB9 CiAKICAgICBpZiAoZXhwcmVzc2lvbnMuc2l6ZSgpID09IDEpCi0gICAgICAgIHJldHVybiBXVEZN b3ZlKGV4cHJlc3Npb25zWzBdKTsKKyAgICAgICAgcmV0dXJuIHsgbWFrZVVuaXF1ZVJlZjxBU1Q6 OkVmZmVjdGZ1bEV4cHJlc3Npb25TdGF0ZW1lbnQ+KFdURk1vdmUoZXhwcmVzc2lvbnNbMF0pKSB9 OwogICAgIHVuc2lnbmVkIGVuZE9mZnNldCA9IG1fbGV4ZXIucGVlaygpLnN0YXJ0T2Zmc2V0KCk7 CiAgICAgQ29kZUxvY2F0aW9uIGxvY2F0aW9uKG9yaWdpbi0+c3RhcnRPZmZzZXQoKSwgZW5kT2Zm c2V0KTsKLSAgICByZXR1cm4geyBtYWtlVW5pcXVlUmVmPEFTVDo6Q29tbWFFeHByZXNzaW9uPihs b2NhdGlvbiwgV1RGTW92ZShleHByZXNzaW9ucykpIH07CisgICAgYXV0byBjb21tYUV4cHJlc3Np b24gPSBtYWtlVW5pcXVlUmVmPEFTVDo6Q29tbWFFeHByZXNzaW9uPihsb2NhdGlvbiwgV1RGTW92 ZShleHByZXNzaW9ucykpOworICAgIHJldHVybiB7IG1ha2VVbmlxdWVSZWY8QVNUOjpFZmZlY3Rm dWxFeHByZXNzaW9uU3RhdGVtZW50PihXVEZNb3ZlKGNvbW1hRXhwcmVzc2lvbikpIH07CiB9CiAK IGF1dG8gUGFyc2VyOjpwYXJzZUVmZmVjdGZ1bEFzc2lnbm1lbnQoKSAtPiBFeHBlY3RlZDxVbmlx dWVSZWY8QVNUOjpFeHByZXNzaW9uPiwgRXJyb3I+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTFBhcnNlci5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy93ZWJncHUvV0hMU0wvV0hMU0xQYXJzZXIuaAppbmRleCA0YWI4MzJhNDUzNS4uYmUwNTMy ZGViZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dI TFNMUGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hM U0xQYXJzZXIuaApAQCAtMTMxLDcgKzEzMSw3IEBAIHByaXZhdGU6CiAgICAgRXhwZWN0ZWQ8QVNU OjpWYXJpYWJsZURlY2xhcmF0aW9uc1N0YXRlbWVudCwgRXJyb3I+IHBhcnNlVmFyaWFibGVEZWNs YXJhdGlvbnMoKTsKICAgICBFeHBlY3RlZDxVbmlxdWVSZWY8QVNUOjpTdGF0ZW1lbnQ+LCBFcnJv cj4gcGFyc2VTdGF0ZW1lbnQoKTsKIAotICAgIEV4cGVjdGVkPFVuaXF1ZVJlZjxBU1Q6OkV4cHJl c3Npb24+LCBFcnJvcj4gcGFyc2VFZmZlY3RmdWxFeHByZXNzaW9uKCk7CisgICAgRXhwZWN0ZWQ8 VW5pcXVlUmVmPEFTVDo6U3RhdGVtZW50PiwgRXJyb3I+IHBhcnNlRWZmZWN0ZnVsRXhwcmVzc2lv bigpOwogICAgIEV4cGVjdGVkPFVuaXF1ZVJlZjxBU1Q6OkV4cHJlc3Npb24+LCBFcnJvcj4gcGFy c2VFZmZlY3RmdWxBc3NpZ25tZW50KCk7CiAgICAgc3RydWN0IFN1ZmZpeEV4cHJlc3Npb24gewog ICAgICAgICBTdWZmaXhFeHByZXNzaW9uKFVuaXF1ZVJlZjxBU1Q6OkV4cHJlc3Npb24+JiYgcmVz dWx0LCBib29sIHN1Y2Nlc3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmdwdS9XSExTTC9XSExTTFZpc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJn cHUvV0hMU0wvV0hMU0xWaXNpdG9yLmNwcAppbmRleCBjOGNkMDI1Y2EyZC4uODEyM2QxNjkzZDkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMVmlz aXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xW aXNpdG9yLmNwcApAQCAtNDYxLDExICs0NjEsNyBAQCB2b2lkIFZpc2l0b3I6OnZpc2l0KEFTVDo6 RmFsbHRocm91Z2gmKQogCiB2b2lkIFZpc2l0b3I6OnZpc2l0KEFTVDo6Rm9yTG9vcCYgZm9yTG9v cCkKIHsKLSAgICBXVEY6OnZpc2l0KFdURjo6bWFrZVZpc2l0b3IoWyZdKFVuaXF1ZVJlZjxBU1Q6 OlN0YXRlbWVudD4mIHN0YXRlbWVudCkgewotICAgICAgICBjaGVja0Vycm9yQW5kVmlzaXQoc3Rh dGVtZW50KTsKLSAgICB9LCBbJl0oVW5pcXVlUmVmPEFTVDo6RXhwcmVzc2lvbj4mIGV4cHJlc3Np b24pIHsKLSAgICAgICAgY2hlY2tFcnJvckFuZFZpc2l0KGV4cHJlc3Npb24pOwotICAgIH0pLCBm b3JMb29wLmluaXRpYWxpemF0aW9uKCkpOworICAgIGNoZWNrRXJyb3JBbmRWaXNpdChmb3JMb29w LmluaXRpYWxpemF0aW9uKCkpOwogICAgIGlmIChmb3JMb29wLmNvbmRpdGlvbigpKQogICAgICAg ICBjaGVja0Vycm9yQW5kVmlzaXQoKmZvckxvb3AuY29uZGl0aW9uKCkpOwogICAgIGlmIChmb3JM b29wLmluY3JlbWVudCgpKQo=