200328 2019-07-31 18:40:31 -0700 [WHLSL] Replace memsetZero function with inline "= { }" code 2019-07-31 22:18:19 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam commit-queue dino fpizlo jonlee justin_fan mmaxfield rmorisset webkit-bug-importer oldest_to_newest 1557480 0 saam 2019-07-31 18:40:31 -0700 inline "x = { 0 };" instead. This is a metal compile time speedup 1557489 1 375277 saam 2019-07-31 18:51:54 -0700 Created attachment 375277 patch 1557490 2 375277 rmorisset 2019-07-31 18:52:48 -0700 Comment on attachment 375277 patch r=me 1557515 3 375277 saam 2019-07-31 21:01:06 -0700 Comment on attachment 375277 patch View in context: https://bugs.webkit.org/attachment.cgi?id=375277&action=review > Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp:587 > + "else ", variableName, " = { 0 };\n" these need to be "= {}" instead of = "{ 0 }" to also work with enums. 1557518 4 375290 saam 2019-07-31 21:21:01 -0700 Created attachment 375290 patch for landing 1557529 5 375290 commit-queue 2019-07-31 22:17:49 -0700 Comment on attachment 375290 patch for landing Clearing flags on attachment: 375290 Committed r248096: <https://trac.webkit.org/changeset/248096> 1557530 6 commit-queue 2019-07-31 22:17:50 -0700 All reviewed patches have been landed. Closing bug. 1557531 7 webkit-bug-importer 2019-07-31 22:18:19 -0700 <rdar://problem/53797375> 375277 2019-07-31 18:51:54 -0700 2019-07-31 21:21:01 -0700 patch c-backup.diff text/plain 5142 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0ODA5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA3LTMxICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gUmVwbGFjZSBtZW1z ZXRaZXJvIGZ1bmN0aW9uIHdpdGggaW5saW5lICI9IHsgMCB9IiBjb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzMjgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgfjIwbXMgbWV0YWwg Y29tcGlsZSB0aW1lIGltcHJvdmVtZW50IG9uIGNvbXB1dGVfYm9pZHMuCisKKyAgICAgICAgKiBN b2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTEZ1bmN0aW9uV3JpdGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OldITFNMOjpNZXRhbDo6RnVuY3Rpb25EZWZpbml0aW9uV3JpdGVyOjpGdW5j dGlvbkRlZmluaXRpb25Xcml0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6V0hMU0w6Ok1ldGFsOjpG dW5jdGlvbkRlZmluaXRpb25Xcml0ZXI6OnZpc2l0KToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdw dS9XSExTTC9NZXRhbC9XSExTTE5hdGl2ZUZ1bmN0aW9uV3JpdGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OldITFNMOjpNZXRhbDo6d3JpdGVOYXRpdmVGdW5jdGlvbik6CisgICAgICAgICogTW9k dWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xOYXRpdmVGdW5jdGlvbldyaXRlci5oOgorCiAy MDE5LTA3LTMxICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtX SExTTF0gUmVtb3ZlIFVubmFtZWRUeXBlIGNvcHkvbW92ZSBjb25zdHJ1Y3RvcnMgYW5kIG1hcmsg Y2xhc3NlcyBhcyBmaW5hbApJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hM U0wvTWV0YWwvV0hMU0xGdW5jdGlvbldyaXRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xGdW5jdGlvbldyaXRlci5jcHAJ KHJldmlzaW9uIDI0ODA5MykKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNM L01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MSwxOCAr OTEsOCBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9mdW5jdGlvbk1hcHBpbmcoZnVuY3Rpb25NYXBw aW5nKQogICAgICAgICAsIG1fbGF5b3V0KGxheW91dCkKICAgICB7Ci0gICAgICAgIG1fc3RyaW5n QnVpbGRlci5mbGV4aWJsZUFwcGVuZCgKLSAgICAgICAgICAgICJ0ZW1wbGF0ZSA8dHlwZW5hbWUg VD5cbiIKLSAgICAgICAgICAgICJpbmxpbmUgdm9pZCAiLCBtZW1zZXRaZXJvRnVuY3Rpb25OYW1l LCAiKHRocmVhZCBUJiB2YWx1ZSlcbiIKLSAgICAgICAgICAgICJ7XG4iCi0gICAgICAgICAgICAi ICAgIHRocmVhZCBjaGFyKiBwdHIgPSBzdGF0aWNfY2FzdDx0aHJlYWQgY2hhcio+KHN0YXRpY19j YXN0PHRocmVhZCB2b2lkKj4oJnZhbHVlKSk7XG4iCi0gICAgICAgICAgICAiICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgc2l6ZW9mKFQpOyArK2kpXG4iCi0gICAgICAgICAgICAiICAgICAgICBw dHJbaV0gPSAwO1xuIgotICAgICAgICAgICAgIn1cbiIpOwogICAgIH0KIAotICAgIHN0YXRpYyBj b25zdGV4cHIgY29uc3QgY2hhciogbWVtc2V0WmVyb0Z1bmN0aW9uTmFtZSA9ICJtZW1zZXRaZXJv IjsKLQogICAgIHZpcnR1YWwgfkZ1bmN0aW9uRGVmaW5pdGlvbldyaXRlcigpID0gZGVmYXVsdDsK IAogICAgIFN0cmluZyB0b1N0cmluZygpIHsgcmV0dXJuIG1fc3RyaW5nQnVpbGRlci50b1N0cmlu ZygpOyB9CkBAIC0yMTcsNyArMjA3LDcgQEAgdm9pZCBGdW5jdGlvbkRlZmluaXRpb25Xcml0ZXI6 OnZpc2l0KEFTVAogewogICAgIGF1dG8gaXRlcmF0b3IgPSBtX2Z1bmN0aW9uTWFwcGluZy5maW5k KCZuYXRpdmVGdW5jdGlvbkRlY2xhcmF0aW9uKTsKICAgICBBU1NFUlQoaXRlcmF0b3IgIT0gbV9m dW5jdGlvbk1hcHBpbmcuZW5kKCkpOwotICAgIG1fc3RyaW5nQnVpbGRlci5hcHBlbmQod3JpdGVO YXRpdmVGdW5jdGlvbihuYXRpdmVGdW5jdGlvbkRlY2xhcmF0aW9uLCBpdGVyYXRvci0+dmFsdWUs IG1faW50cmluc2ljcywgbV90eXBlTmFtZXIsIG1lbXNldFplcm9GdW5jdGlvbk5hbWUpKTsKKyAg ICBtX3N0cmluZ0J1aWxkZXIuYXBwZW5kKHdyaXRlTmF0aXZlRnVuY3Rpb24obmF0aXZlRnVuY3Rp b25EZWNsYXJhdGlvbiwgaXRlcmF0b3ItPnZhbHVlLCBtX2ludHJpbnNpY3MsIG1fdHlwZU5hbWVy KSk7CiB9CiAKIHZvaWQgRnVuY3Rpb25EZWZpbml0aW9uV3JpdGVyOjp2aXNpdChBU1Q6OkZ1bmN0 aW9uRGVmaW5pdGlvbiYgZnVuY3Rpb25EZWZpbml0aW9uKQpAQCAtNTk0LDcgKzU4NCw3IEBAIHZv aWQgRnVuY3Rpb25EZWZpbml0aW9uV3JpdGVyOjp2aXNpdChBU1QKICAgICAgICAgbV90eXBlTmFt ZXIubWFuZ2xlZE5hbWVGb3JUeXBlKGRlcmVmZXJlbmNlRXhwcmVzc2lvbi5wb2ludGVyKCkucmVz b2x2ZWRUeXBlKCkpLCAnICcsIHBvaW50ZXJOYW1lLCAiID0gIiwgcmlnaHQsICI7XG4iLAogICAg ICAgICBtX3R5cGVOYW1lci5tYW5nbGVkTmFtZUZvclR5cGUoZGVyZWZlcmVuY2VFeHByZXNzaW9u LnJlc29sdmVkVHlwZSgpKSwgJyAnLCB2YXJpYWJsZU5hbWUsICI7XG4iLAogICAgICAgICAiaWYg KCIsIHBvaW50ZXJOYW1lLCAiKSAiLCB2YXJpYWJsZU5hbWUsICIgPSAqIiwgcmlnaHQsICI7XG4i LAotICAgICAgICAiZWxzZSAiLCBtZW1zZXRaZXJvRnVuY3Rpb25OYW1lLCAnKCcsIHZhcmlhYmxl TmFtZSwgIik7XG4iCisgICAgICAgICJlbHNlICIsIHZhcmlhYmxlTmFtZSwgIiA9IHsgMCB9O1xu IgogICAgICk7CiAgICAgYXBwZW5kTGVmdFZhbHVlKGRlcmVmZXJlbmNlRXhwcmVzc2lvbiwgdmFy aWFibGVOYW1lLCBwb2ludGVyTmFtZSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTE5hdGl2ZUZ1bmN0aW9uV3JpdGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTE5h dGl2ZUZ1bmN0aW9uV3JpdGVyLmNwcAkocmV2aXNpb24gMjQ4MDkzKQorKysgU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xOYXRpdmVGdW5jdGlvbldyaXRlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw3ICsxMjAsNyBAQCBzdGF0aWMgY29uc3QgY2hhciog dmVjdG9yU3VmZml4KGludCB2ZWN0CiAgICAgfQogfQogCi1TdHJpbmcgd3JpdGVOYXRpdmVGdW5j dGlvbihBU1Q6Ok5hdGl2ZUZ1bmN0aW9uRGVjbGFyYXRpb24mIG5hdGl2ZUZ1bmN0aW9uRGVjbGFy YXRpb24sIFN0cmluZyYgb3V0cHV0RnVuY3Rpb25OYW1lLCBJbnRyaW5zaWNzJiBpbnRyaW5zaWNz LCBUeXBlTmFtZXImIHR5cGVOYW1lciwgY29uc3QgY2hhciogbWVtc2V0WmVyb0Z1bmN0aW9uTmFt ZSkKK1N0cmluZyB3cml0ZU5hdGl2ZUZ1bmN0aW9uKEFTVDo6TmF0aXZlRnVuY3Rpb25EZWNsYXJh dGlvbiYgbmF0aXZlRnVuY3Rpb25EZWNsYXJhdGlvbiwgU3RyaW5nJiBvdXRwdXRGdW5jdGlvbk5h bWUsIEludHJpbnNpY3MmIGludHJpbnNpY3MsIFR5cGVOYW1lciYgdHlwZU5hbWVyKQogewogICAg IFN0cmluZ0J1aWxkZXIgc3RyaW5nQnVpbGRlcjsKICAgICBpZiAobmF0aXZlRnVuY3Rpb25EZWNs YXJhdGlvbi5pc0Nhc3QoKSkgewpAQCAtMTI5LDggKzEyOSw3IEBAIFN0cmluZyB3cml0ZU5hdGl2 ZUZ1bmN0aW9uKEFTVDo6TmF0aXZlRnUKICAgICAgICAgaWYgKCFuYXRpdmVGdW5jdGlvbkRlY2xh cmF0aW9uLnBhcmFtZXRlcnMoKS5zaXplKCkpIHsKICAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIu ZmxleGlibGVBcHBlbmQoCiAgICAgICAgICAgICAgICAgbWV0YWxSZXR1cm5OYW1lLCAnICcsIG91 dHB1dEZ1bmN0aW9uTmFtZSwgIigpIHtcbiIKLSAgICAgICAgICAgICAgICAiICAgICIsIG1ldGFs UmV0dXJuTmFtZSwgIiB4O1xuIgotICAgICAgICAgICAgICAgICIgICAgIiwgbWVtc2V0WmVyb0Z1 bmN0aW9uTmFtZSwgIih4KTtcbiIKKyAgICAgICAgICAgICAgICAiICAgICIsIG1ldGFsUmV0dXJu TmFtZSwgIiB4ID0geyAwIH07XG4iCiAgICAgICAgICAgICAgICAgIiAgICByZXR1cm4geDtcbiIK ICAgICAgICAgICAgICAgICAifVxuIgogICAgICAgICAgICAgKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0ZXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9NZXRh bC9XSExTTE5hdGl2ZUZ1bmN0aW9uV3JpdGVyLmgJKHJldmlzaW9uIDI0ODA5MykKKysrIFNvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25X cml0ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsNyBAQCBuYW1lc3BhY2UgTWV0YWwg ewogCiBjbGFzcyBUeXBlTmFtZXI7CiAKLVN0cmluZyB3cml0ZU5hdGl2ZUZ1bmN0aW9uKEFTVDo6 TmF0aXZlRnVuY3Rpb25EZWNsYXJhdGlvbiYsIFN0cmluZyYgb3V0cHV0RnVuY3Rpb25OYW1lLCBJ bnRyaW5zaWNzJiwgVHlwZU5hbWVyJiwgY29uc3QgY2hhciogbWVtc2V0WmVyb0Z1bmN0aW9uTmFt ZSk7CitTdHJpbmcgd3JpdGVOYXRpdmVGdW5jdGlvbihBU1Q6Ok5hdGl2ZUZ1bmN0aW9uRGVjbGFy YXRpb24mLCBTdHJpbmcmIG91dHB1dEZ1bmN0aW9uTmFtZSwgSW50cmluc2ljcyYsIFR5cGVOYW1l ciYpOwogCiB9CiAK 375290 2019-07-31 21:21:01 -0700 2019-07-31 22:17:49 -0700 patch for landing c-backup.diff text/plain 5136 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0ODA5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA3LTMxICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gUmVwbGFjZSBtZW1z ZXRaZXJvIGZ1bmN0aW9uIHdpdGggaW5saW5lICI9IHsgfSIgY29kZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMzI4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgUm9iaW4gTW9yaXNzZXQuCisKKyAgICAgICAgVGhpcyBpcyBhIH4yMG1zIG1ldGFsIGNv bXBpbGUgdGltZSBpbXByb3ZlbWVudCBvbiBjb21wdXRlX2JvaWRzLgorCisgICAgICAgICogTW9k dWxlcy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xGdW5jdGlvbldyaXRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXSExTTDo6TWV0YWw6OkZ1bmN0aW9uRGVmaW5pdGlvbldyaXRlcjo6RnVuY3Rp b25EZWZpbml0aW9uV3JpdGVyKToKKyAgICAgICAgKFdlYkNvcmU6OldITFNMOjpNZXRhbDo6RnVu Y3Rpb25EZWZpbml0aW9uV3JpdGVyOjp2aXNpdCk6CisgICAgICAgICogTW9kdWxlcy93ZWJncHUv V0hMU0wvTWV0YWwvV0hMU0xOYXRpdmVGdW5jdGlvbldyaXRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXSExTTDo6TWV0YWw6OndyaXRlTmF0aXZlRnVuY3Rpb24pOgorICAgICAgICAqIE1vZHVs ZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0ZXIuaDoKKwogMjAx OS0wNy0zMSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0hM U0xdIFJlbW92ZSBVbm5hbWVkVHlwZSBjb3B5L21vdmUgY29uc3RydWN0b3JzIGFuZCBtYXJrIGNs YXNzZXMgYXMgZmluYWwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNM L01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwCShy ZXZpc2lvbiAyNDgwOTMpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9N ZXRhbC9XSExTTEZ1bmN0aW9uV3JpdGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTEsMTggKzkx LDggQEAgcHVibGljOgogICAgICAgICAsIG1fZnVuY3Rpb25NYXBwaW5nKGZ1bmN0aW9uTWFwcGlu ZykKICAgICAgICAgLCBtX2xheW91dChsYXlvdXQpCiAgICAgewotICAgICAgICBtX3N0cmluZ0J1 aWxkZXIuZmxleGlibGVBcHBlbmQoCi0gICAgICAgICAgICAidGVtcGxhdGUgPHR5cGVuYW1lIFQ+ XG4iCi0gICAgICAgICAgICAiaW5saW5lIHZvaWQgIiwgbWVtc2V0WmVyb0Z1bmN0aW9uTmFtZSwg Iih0aHJlYWQgVCYgdmFsdWUpXG4iCi0gICAgICAgICAgICAie1xuIgotICAgICAgICAgICAgIiAg ICB0aHJlYWQgY2hhciogcHRyID0gc3RhdGljX2Nhc3Q8dGhyZWFkIGNoYXIqPihzdGF0aWNfY2Fz dDx0aHJlYWQgdm9pZCo+KCZ2YWx1ZSkpO1xuIgotICAgICAgICAgICAgIiAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IHNpemVvZihUKTsgKytpKVxuIgotICAgICAgICAgICAgIiAgICAgICAgcHRy W2ldID0gMDtcbiIKLSAgICAgICAgICAgICJ9XG4iKTsKICAgICB9CiAKLSAgICBzdGF0aWMgY29u c3RleHByIGNvbnN0IGNoYXIqIG1lbXNldFplcm9GdW5jdGlvbk5hbWUgPSAibWVtc2V0WmVybyI7 Ci0KICAgICB2aXJ0dWFsIH5GdW5jdGlvbkRlZmluaXRpb25Xcml0ZXIoKSA9IGRlZmF1bHQ7CiAK ICAgICBTdHJpbmcgdG9TdHJpbmcoKSB7IHJldHVybiBtX3N0cmluZ0J1aWxkZXIudG9TdHJpbmco KTsgfQpAQCAtMjE3LDcgKzIwNyw3IEBAIHZvaWQgRnVuY3Rpb25EZWZpbml0aW9uV3JpdGVyOjp2 aXNpdChBU1QKIHsKICAgICBhdXRvIGl0ZXJhdG9yID0gbV9mdW5jdGlvbk1hcHBpbmcuZmluZCgm bmF0aXZlRnVuY3Rpb25EZWNsYXJhdGlvbik7CiAgICAgQVNTRVJUKGl0ZXJhdG9yICE9IG1fZnVu Y3Rpb25NYXBwaW5nLmVuZCgpKTsKLSAgICBtX3N0cmluZ0J1aWxkZXIuYXBwZW5kKHdyaXRlTmF0 aXZlRnVuY3Rpb24obmF0aXZlRnVuY3Rpb25EZWNsYXJhdGlvbiwgaXRlcmF0b3ItPnZhbHVlLCBt X2ludHJpbnNpY3MsIG1fdHlwZU5hbWVyLCBtZW1zZXRaZXJvRnVuY3Rpb25OYW1lKSk7CisgICAg bV9zdHJpbmdCdWlsZGVyLmFwcGVuZCh3cml0ZU5hdGl2ZUZ1bmN0aW9uKG5hdGl2ZUZ1bmN0aW9u RGVjbGFyYXRpb24sIGl0ZXJhdG9yLT52YWx1ZSwgbV9pbnRyaW5zaWNzLCBtX3R5cGVOYW1lcikp OwogfQogCiB2b2lkIEZ1bmN0aW9uRGVmaW5pdGlvbldyaXRlcjo6dmlzaXQoQVNUOjpGdW5jdGlv bkRlZmluaXRpb24mIGZ1bmN0aW9uRGVmaW5pdGlvbikKQEAgLTU5NCw3ICs1ODQsNyBAQCB2b2lk IEZ1bmN0aW9uRGVmaW5pdGlvbldyaXRlcjo6dmlzaXQoQVNUCiAgICAgICAgIG1fdHlwZU5hbWVy Lm1hbmdsZWROYW1lRm9yVHlwZShkZXJlZmVyZW5jZUV4cHJlc3Npb24ucG9pbnRlcigpLnJlc29s dmVkVHlwZSgpKSwgJyAnLCBwb2ludGVyTmFtZSwgIiA9ICIsIHJpZ2h0LCAiO1xuIiwKICAgICAg ICAgbV90eXBlTmFtZXIubWFuZ2xlZE5hbWVGb3JUeXBlKGRlcmVmZXJlbmNlRXhwcmVzc2lvbi5y ZXNvbHZlZFR5cGUoKSksICcgJywgdmFyaWFibGVOYW1lLCAiO1xuIiwKICAgICAgICAgImlmICgi LCBwb2ludGVyTmFtZSwgIikgIiwgdmFyaWFibGVOYW1lLCAiID0gKiIsIHJpZ2h0LCAiO1xuIiwK LSAgICAgICAgImVsc2UgIiwgbWVtc2V0WmVyb0Z1bmN0aW9uTmFtZSwgJygnLCB2YXJpYWJsZU5h bWUsICIpO1xuIgorICAgICAgICAiZWxzZSAiLCB2YXJpYWJsZU5hbWUsICIgPSB7IH07XG4iCiAg ICAgKTsKICAgICBhcHBlbmRMZWZ0VmFsdWUoZGVyZWZlcmVuY2VFeHByZXNzaW9uLCB2YXJpYWJs ZU5hbWUsIHBvaW50ZXJOYW1lKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi Z3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0ZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZl RnVuY3Rpb25Xcml0ZXIuY3BwCShyZXZpc2lvbiAyNDgwOTMpCisrKyBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTE5hdGl2ZUZ1bmN0aW9uV3JpdGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTIwLDcgKzEyMCw3IEBAIHN0YXRpYyBjb25zdCBjaGFyKiB2ZWN0 b3JTdWZmaXgoaW50IHZlY3QKICAgICB9CiB9CiAKLVN0cmluZyB3cml0ZU5hdGl2ZUZ1bmN0aW9u KEFTVDo6TmF0aXZlRnVuY3Rpb25EZWNsYXJhdGlvbiYgbmF0aXZlRnVuY3Rpb25EZWNsYXJhdGlv biwgU3RyaW5nJiBvdXRwdXRGdW5jdGlvbk5hbWUsIEludHJpbnNpY3MmIGludHJpbnNpY3MsIFR5 cGVOYW1lciYgdHlwZU5hbWVyLCBjb25zdCBjaGFyKiBtZW1zZXRaZXJvRnVuY3Rpb25OYW1lKQor U3RyaW5nIHdyaXRlTmF0aXZlRnVuY3Rpb24oQVNUOjpOYXRpdmVGdW5jdGlvbkRlY2xhcmF0aW9u JiBuYXRpdmVGdW5jdGlvbkRlY2xhcmF0aW9uLCBTdHJpbmcmIG91dHB1dEZ1bmN0aW9uTmFtZSwg SW50cmluc2ljcyYgaW50cmluc2ljcywgVHlwZU5hbWVyJiB0eXBlTmFtZXIpCiB7CiAgICAgU3Ry aW5nQnVpbGRlciBzdHJpbmdCdWlsZGVyOwogICAgIGlmIChuYXRpdmVGdW5jdGlvbkRlY2xhcmF0 aW9uLmlzQ2FzdCgpKSB7CkBAIC0xMjksOCArMTI5LDcgQEAgU3RyaW5nIHdyaXRlTmF0aXZlRnVu Y3Rpb24oQVNUOjpOYXRpdmVGdQogICAgICAgICBpZiAoIW5hdGl2ZUZ1bmN0aW9uRGVjbGFyYXRp b24ucGFyYW1ldGVycygpLnNpemUoKSkgewogICAgICAgICAgICAgc3RyaW5nQnVpbGRlci5mbGV4 aWJsZUFwcGVuZCgKICAgICAgICAgICAgICAgICBtZXRhbFJldHVybk5hbWUsICcgJywgb3V0cHV0 RnVuY3Rpb25OYW1lLCAiKCkge1xuIgotICAgICAgICAgICAgICAgICIgICAgIiwgbWV0YWxSZXR1 cm5OYW1lLCAiIHg7XG4iCi0gICAgICAgICAgICAgICAgIiAgICAiLCBtZW1zZXRaZXJvRnVuY3Rp b25OYW1lLCAiKHgpO1xuIgorICAgICAgICAgICAgICAgICIgICAgIiwgbWV0YWxSZXR1cm5OYW1l LCAiIHggPSB7IH07XG4iCiAgICAgICAgICAgICAgICAgIiAgICByZXR1cm4geDtcbiIKICAgICAg ICAgICAgICAgICAifVxuIgogICAgICAgICAgICAgKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0ZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExT TE5hdGl2ZUZ1bmN0aW9uV3JpdGVyLmgJKHJldmlzaW9uIDI0ODA5MykKKysrIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMTmF0aXZlRnVuY3Rpb25Xcml0ZXIu aAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsNyBAQCBuYW1lc3BhY2UgTWV0YWwgewogCiBj bGFzcyBUeXBlTmFtZXI7CiAKLVN0cmluZyB3cml0ZU5hdGl2ZUZ1bmN0aW9uKEFTVDo6TmF0aXZl RnVuY3Rpb25EZWNsYXJhdGlvbiYsIFN0cmluZyYgb3V0cHV0RnVuY3Rpb25OYW1lLCBJbnRyaW5z aWNzJiwgVHlwZU5hbWVyJiwgY29uc3QgY2hhciogbWVtc2V0WmVyb0Z1bmN0aW9uTmFtZSk7CitT dHJpbmcgd3JpdGVOYXRpdmVGdW5jdGlvbihBU1Q6Ok5hdGl2ZUZ1bmN0aW9uRGVjbGFyYXRpb24m LCBTdHJpbmcmIG91dHB1dEZ1bmN0aW9uTmFtZSwgSW50cmluc2ljcyYsIFR5cGVOYW1lciYpOwog CiB9CiAK