236098 2022-02-03 12:44:07 -0800 Revert some structured binding workarounds with Clang 2022-02-04 10:52:19 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 chris.reid chris.reid alecflett beidson clopez don.olmstead ews-watchlist fujii hi joepeck jsbell pangle ross.kirsling sam stephan.szabo webkit-bug-importer oldest_to_newest 1837058 0 chris.reid 2022-02-03 12:44:07 -0800 This is now fixed in clang so these workarounds are no longer needed. 1837075 1 450809 chris.reid 2022-02-03 13:19:31 -0800 Created attachment 450809 patch 1837501 2 ews-feeder 2022-02-04 10:51:43 -0800 Committed r289128 (246825@main): <https://commits.webkit.org/246825@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450809. 1837502 3 webkit-bug-importer 2022-02-04 10:52:19 -0800 <rdar://problem/88497773> 450809 2022-02-03 13:19:31 -0800 2022-02-04 10:51:45 -0800 patch 236098.diff text/plain 6761 chris.reid ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxZjMwOGMwMTJlZTAuLjhmNmFiZGRlNDZkMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDIyLTAyLTAzICBDaHJpc3RvcGhlciBSZWlkICA8Y2hyaXMucmVpZEBz b255LmNvbT4KKworICAgICAgICBSZXZlcnQgc29tZSBzdHJ1Y3R1cmVkIGJpbmRpbmcgd29ya2Fy b3VuZHMgd2l0aCBDbGFuZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM2MDk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmV2ZXJ0IHN0cnVjdHVyZWQgYmluZGluZ3Mgd29ya2Fyb3VuZHMgbWFkZSBpbiBy Mjg4MzA5LCByMjYxNTcyLCByMjQ5NTI0IG5vdyB0aGF0IHRoaXMgaXMgZml4ZWQgaW4gY2xhbmcu CisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUu Y3BwOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5n U3RvcmUuY3BwOgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0Fn ZW50LmNwcDoKKwogMjAyMi0wMi0wMyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUu Y29tPgogCiAgICAgICAgIENyYXNoIGF0IGNvbS5hcHBsZS5XZWJLaXQ6IFdlYktpdDo6UmVtb3Rl TGF5ZXJCYWNraW5nU3RvcmU6OmRpc3BsYXkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuY3BwCmluZGV4 IDVhNTNlMjMxNTI2OC4uOWRkYzBmY2Y5OTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAK QEAgLTMxMCwxOSArMzEwLDE5IEBAIElEQkVycm9yIE1lbW9yeU9iamVjdFN0b3JlOjp1cGRhdGVJ bmRleGVzRm9yUHV0UmVjb3JkKGNvbnN0IElEQktleURhdGEmIGtleSwgY29uCiAgICAgSURCRXJy b3IgZXJyb3I7CiAgICAgVmVjdG9yPHN0ZDo6cGFpcjxNZW1vcnlJbmRleCosIEluZGV4S2V5Pj4g Y2hhbmdlZEluZGV4UmVjb3JkczsKIAotICAgIGZvciAoY29uc3QgYXV0byYgZW50cnkgOiBpbmRl eEtleXMpIHsKLSAgICAgICAgYXV0byogaW5kZXggPSBtX2luZGV4ZXNCeUlkZW50aWZpZXIuZ2V0 KGVudHJ5LmtleSk7CisgICAgZm9yIChjb25zdCBhdXRvJiBbaW5kZXhJRCwgaW5kZXhLZXldIDog aW5kZXhLZXlzKSB7CisgICAgICAgIGF1dG8qIGluZGV4ID0gbV9pbmRleGVzQnlJZGVudGlmaWVy LmdldChpbmRleElEKTsKICAgICAgICAgQVNTRVJUKGluZGV4KTsKICAgICAgICAgaWYgKCFpbmRl eCkgewogICAgICAgICAgICAgZXJyb3IgPSBJREJFcnJvciB7IEludmFsaWRTdGF0ZUVycm9yLCAi TWlzc2luZyBpbmRleCBtZXRhZGF0YSIgfTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAKLSAgICAgICAgZXJyb3IgPSBpbmRleC0+cHV0SW5kZXhLZXkoa2V5LCBlbnRyeS52YWx1ZSk7 CisgICAgICAgIGVycm9yID0gaW5kZXgtPnB1dEluZGV4S2V5KGtleSwgaW5kZXhLZXkpOwogICAg ICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKQogICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAg Y2hhbmdlZEluZGV4UmVjb3Jkcy5hcHBlbmQoc3RkOjptYWtlX3BhaXIoaW5kZXgsIGVudHJ5LnZh bHVlKSk7CisgICAgICAgIGNoYW5nZWRJbmRleFJlY29yZHMuYXBwZW5kKHN0ZDo6bWFrZV9wYWly KGluZGV4LCBpbmRleEtleSkpOwogICAgIH0KIAogICAgIC8vIElmIGFueSBvZiB0aGUgaW5kZXgg cHV0cyBmYWlsZWQsIHJldmVydCBhbGwgb2YgdGhlIG9uZXMgdGhhdCB3ZW50IHRocm91Z2guCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRl SURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IDI3Y2Q4ZWVjNTNlMS4uNzg0NjFm MTM2Zjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcApAQCAtMTkxMyw4ICsx OTEzLDggQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjp1cGRhdGVBbGxJbmRleGVz Rm9yQWRkUmVjb3JkKGNvbnN0IElEQk9iamVjdFN0b3IKICAgICBjb25zdCBhdXRvJiBpbmRleE1h cCA9IGluZm8uaW5kZXhNYXAoKTsKICAgICBib29sIGFueVJlY29yZHNTdWNjZWVkZWQgPSBmYWxz ZTsKIAotICAgIGZvciAoY29uc3QgYXV0byYgZW50cnkgOiBpbmRleEtleXMpIHsKLSAgICAgICAg YXV0byBpbmRleEl0ZXJhdG9yID0gaW5kZXhNYXAuZmluZChlbnRyeS5rZXkpOworICAgIGZvciAo Y29uc3QgYXV0byYgW2luZGV4SUQsIGluZGV4S2V5XSA6IGluZGV4S2V5cykgeworICAgICAgICBh dXRvIGluZGV4SXRlcmF0b3IgPSBpbmRleE1hcC5maW5kKGluZGV4SUQpOwogICAgICAgICBBU1NF UlQoaW5kZXhJdGVyYXRvciAhPSBpbmRleE1hcC5lbmQoKSk7CiAKICAgICAgICAgaWYgKGluZGV4 SXRlcmF0b3IgPT0gaW5kZXhNYXAuZW5kKCkpIHsKQEAgLTE5MjIsNyArMTkyMiw3IEBAIElEQkVy cm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dXBkYXRlQWxsSW5kZXhlc0ZvckFkZFJlY29yZChj b25zdCBJREJPYmplY3RTdG9yCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCi0gICAg ICAgIGVycm9yID0gdW5jaGVja2VkUHV0SW5kZXhLZXkoaW5kZXhJdGVyYXRvci0+dmFsdWUsIGtl eSwgZW50cnkudmFsdWUsIHJlY29yZElEKTsKKyAgICAgICAgZXJyb3IgPSB1bmNoZWNrZWRQdXRJ bmRleEtleShpbmRleEl0ZXJhdG9yLT52YWx1ZSwga2V5LCBpbmRleEtleSwgcmVjb3JkSUQpOwog ICAgICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKQogICAgICAgICAgICAgYnJlYWs7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0Fn ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29y a0FnZW50LmNwcAppbmRleCBjMDg3Zjc1MDhjMTguLjZlNWE1ZmM4OWNjZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yTmV0d29ya0Fn ZW50LmNwcApAQCAtMTE5MywxMCArMTE5MywxMCBAQCBQcm90b2NvbDo6RXJyb3JTdHJpbmdPcjx2 b2lkPiBJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6OmludGVyY2VwdFdpdGhSZXF1ZXN0KGNvbnN0CiAg ICAgICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZChtZXRob2QpOwogICAgIGlmIChoZWFkZXJzKSB7 CiAgICAgICAgIEhUVFBIZWFkZXJNYXAgZXhwbGljaXRIZWFkZXJzOwotICAgICAgICBmb3IgKGF1 dG8mIGhlYWRlciA6ICpoZWFkZXJzKSB7Ci0gICAgICAgICAgICBhdXRvIGhlYWRlclZhbHVlID0g aGVhZGVyLnZhbHVlLT5hc1N0cmluZygpOworICAgICAgICBmb3IgKGF1dG8mIFtrZXksIHZhbHVl XSA6ICpoZWFkZXJzKSB7CisgICAgICAgICAgICBhdXRvIGhlYWRlclZhbHVlID0gdmFsdWUtPmFz U3RyaW5nKCk7CiAgICAgICAgICAgICBpZiAoISFoZWFkZXJWYWx1ZSkKLSAgICAgICAgICAgICAg ICBleHBsaWNpdEhlYWRlcnMuYWRkKGhlYWRlci5rZXksIGhlYWRlclZhbHVlKTsKKyAgICAgICAg ICAgICAgICBleHBsaWNpdEhlYWRlcnMuYWRkKGtleSwgaGVhZGVyVmFsdWUpOwogICAgICAgICB9 CiAgICAgICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkcyhXVEZNb3ZlKGV4cGxpY2l0SGVh ZGVycykpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMDM4MDZmNDU3MTEzLi5iYjlhNWZhZTNhZTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDItMDMgIENocmlzdG9waGVyIFJlaWQgIDxj aHJpcy5yZWlkQHNvbnkuY29tPgorCisgICAgICAgIFJldmVydCBzb21lIHN0cnVjdHVyZWQgYmlu ZGluZyB3b3JrYXJvdW5kcyB3aXRoIENsYW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYwOTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZXZlcnQgc3RydWN0dXJlZCBiaW5kaW5ncyB3b3JrYXJvdW5k cyBtYWRlIGluIHIyODgzMDksIHIyNjE1NzIsIHIyNDk1MjQgbm93IHRoYXQgdGhpcyBpcyBmaXhl ZCBpbiBjbGFuZy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvU3RvcmFnZUFy ZWFCYXNlLmNwcDoKKwogMjAyMi0wMi0wMyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBw bGUuY29tPgogCiAgICAgICAgIENyYXNoIGF0IGNvbS5hcHBsZS5XZWJLaXQ6IFdlYktpdDo6UmVt b3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRpc3BsYXkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9TdG9yYWdlQXJlYUJhc2UuY3BwIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL1N0b3JhZ2VBcmVhQmFzZS5jcHAKaW5kZXggYzE2MjM3 NzJmNjI4Li5iYTA5MjQwZGUwMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3Mvc3RvcmFnZS9TdG9yYWdlQXJlYUJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvc3RvcmFnZS9TdG9yYWdlQXJlYUJhc2UuY3BwCkBAIC02NCwxOSArNjQsMTkg QEAgYm9vbCBTdG9yYWdlQXJlYUJhc2U6Omhhc0xpc3RlbmVycygpIGNvbnN0CiAKIHZvaWQgU3Rv cmFnZUFyZWFCYXNlOjpub3RpZnlMaXN0ZW5lcnNBYm91dENsZWFyKCkKIHsKLSAgICBmb3IgKGF1 dG8mIGxpc3RlbmVyIDogbV9saXN0ZW5lcnMpCi0gICAgICAgIElQQzo6Q29ubmVjdGlvbjo6c2Vu ZChsaXN0ZW5lci5rZXksIE1lc3NhZ2VzOjpTdG9yYWdlQXJlYU1hcDo6Q2xlYXJDYWNoZShTdG9y YWdlQXJlYUJhc2U6Om5leHRNZXNzYWdlSWRlbnRpZmllcigpKSwgbGlzdGVuZXIudmFsdWUudG9V SW50NjQoKSk7CisgICAgZm9yIChhdXRvJiBbY29ubmVjdGlvbiwgaWRlbnRpZmllcl0gOiBtX2xp c3RlbmVycykKKyAgICAgICAgSVBDOjpDb25uZWN0aW9uOjpzZW5kKGNvbm5lY3Rpb24sIE1lc3Nh Z2VzOjpTdG9yYWdlQXJlYU1hcDo6Q2xlYXJDYWNoZShTdG9yYWdlQXJlYUJhc2U6Om5leHRNZXNz YWdlSWRlbnRpZmllcigpKSwgaWRlbnRpZmllci50b1VJbnQ2NCgpKTsKIH0KIAogdm9pZCBTdG9y YWdlQXJlYUJhc2U6OmRpc3BhdGNoRXZlbnRzKElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQgc291 cmNlQ29ubmVjdGlvbiwgU3RvcmFnZUFyZWFJbXBsSWRlbnRpZmllciBzb3VyY2VJbXBsSWRlbnRp ZmllciwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0 cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKSBjb25zdAogewogICAgIEFT U0VSVChzb3VyY2VJbXBsSWRlbnRpZmllcik7CiAKLSAgICBmb3IgKGF1dG8mIGxpc3RlbmVyIDog bV9saXN0ZW5lcnMpIHsKKyAgICBmb3IgKGF1dG8mIFtjb25uZWN0aW9uLCBpZGVudGlmaWVyXSA6 IG1fbGlzdGVuZXJzKSB7CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8U3RvcmFnZUFyZWFJbXBsSWRl bnRpZmllcj4gaW1wbElkZW50aWZpZXI7Ci0gICAgICAgIGlmIChsaXN0ZW5lci5rZXkgPT0gc291 cmNlQ29ubmVjdGlvbikKKyAgICAgICAgaWYgKGNvbm5lY3Rpb24gPT0gc291cmNlQ29ubmVjdGlv bikKICAgICAgICAgICAgIGltcGxJZGVudGlmaWVyID0gc291cmNlSW1wbElkZW50aWZpZXI7Ci0g ICAgICAgIElQQzo6Q29ubmVjdGlvbjo6c2VuZChsaXN0ZW5lci5rZXksIE1lc3NhZ2VzOjpTdG9y YWdlQXJlYU1hcDo6RGlzcGF0Y2hTdG9yYWdlRXZlbnQoaW1wbElkZW50aWZpZXIsIGtleSwgb2xk VmFsdWUsIG5ld1ZhbHVlLCB1cmxTdHJpbmcsIFN0b3JhZ2VBcmVhQmFzZTo6bmV4dE1lc3NhZ2VJ ZGVudGlmaWVyKCkpLCBsaXN0ZW5lci52YWx1ZS50b1VJbnQ2NCgpKTsKKyAgICAgICAgSVBDOjpD b25uZWN0aW9uOjpzZW5kKGNvbm5lY3Rpb24sIE1lc3NhZ2VzOjpTdG9yYWdlQXJlYU1hcDo6RGlz cGF0Y2hTdG9yYWdlRXZlbnQoaW1wbElkZW50aWZpZXIsIGtleSwgb2xkVmFsdWUsIG5ld1ZhbHVl LCB1cmxTdHJpbmcsIFN0b3JhZ2VBcmVhQmFzZTo6bmV4dE1lc3NhZ2VJZGVudGlmaWVyKCkpLCBp ZGVudGlmaWVyLnRvVUludDY0KCkpOwogICAgIH0KIH0KIAo=