216335 2020-09-09 17:39:02 -0700 Simplify OptionSet::set 2020-09-09 20:41:29 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=216305 InRadar P2 Normal --- 1 rniwa rniwa benjamin cdumez cmarcelo darin ews-watchlist keith_miller saam sabouhallawa webkit-bug-importer ysuzuki oldest_to_newest 1687207 0 rniwa 2020-09-09 17:39:02 -0700 In https://trac.webkit.org/r266776, I added OptionSet::set. Following some discussion in https://bugs.webkit.org/show_bug.cgi?id=216305#c6, we can see that a simpler variant which uses a branch produces the same assembly in x86_64 and arm64 with -O3. So just use a simpler code since it's easier to read. 1687212 1 408390 rniwa 2020-09-09 18:10:27 -0700 Created attachment 408390 Patch 1687228 2 408390 sabouhallawa 2020-09-09 19:09:32 -0700 Comment on attachment 408390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408390&action=review > Source/WTF/ChangeLog:3 > + Simply OptionSet::set Did you mean to write "Simplify"? 1687258 3 rniwa 2020-09-09 20:24:56 -0700 (In reply to Said Abou-Hallawa from comment #2) > Comment on attachment 408390 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=408390&action=review > > > Source/WTF/ChangeLog:3 > > + Simply OptionSet::set > > Did you mean to write "Simplify"? Oops, indeed. 1687262 4 rniwa 2020-09-09 20:40:25 -0700 Committed r266812: <https://trac.webkit.org/changeset/266812> 1687263 5 webkit-bug-importer 2020-09-09 20:41:29 -0700 <rdar://problem/68615785> 408390 2020-09-09 18:10:27 -0700 2020-09-09 19:08:47 -0700 Patch bug-216335-20200909181026.patch text/plain 3206 rniwa SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjY3NzYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTA5ICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNpbXBseSBPcHRpb25TZXQ6OnNldAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MzM1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2ltcGxpZmllZCB0aGUgaW1w bGVtZW50YXRpb24gb2YgT3B0aW9uU2V0OjpzZXQgc2luY2Ugd2UndmUgdmVyaWZpZWQgdGhhdCBi b3RoIGNsYW5nIGFuZCBnY2MKKyAgICAgICAgZ2VuZXJhdGUgY29tcGFyYWJsZSBjb2RlIGluIHg4 Nl82NCBhbmQgY2xhbmcgZG9lcyB0aGUgc2FtZSBmb3IgYXJtNjQuCisKKyAgICAgICAgKiB3dGYv T3B0aW9uU2V0Lmg6CisgICAgICAgIChXVEY6Ok9wdGlvblNldDo6c2V0KToKKwogMjAyMC0wOS0w OCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBOb2RlIGZsYWdz IHNob3VsZCBiZSBhbiBPcHRpb25TZXQKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL09wdGlvblNldC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL09wdGlvblNldC5oCShyZXZpc2lvbiAyNjY3 NzYpCisrKyBTb3VyY2UvV1RGL3d0Zi9PcHRpb25TZXQuaAkod29ya2luZyBjb3B5KQpAQCAtMTk1 LDcgKzE5NSwxMCBAQCBwdWJsaWM6CiAKICAgICBjb25zdGV4cHIgdm9pZCBzZXQoT3B0aW9uU2V0 IG9wdGlvblNldCwgYm9vbCB2YWx1ZSkKICAgICB7Ci0gICAgICAgIG1fc3RvcmFnZSA9IChtX3N0 b3JhZ2UgJiB+b3B0aW9uU2V0Lm1fc3RvcmFnZSkgfCAoLXN0YXRpY19jYXN0PFN0b3JhZ2VUeXBl Pih2YWx1ZSkgJiBvcHRpb25TZXQubV9zdG9yYWdlKTsKKyAgICAgICAgaWYgKHZhbHVlKQorICAg ICAgICAgICAgYWRkKG9wdGlvblNldCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJlbW92 ZShvcHRpb25TZXQpOwogICAgIH0KIAogICAgIGNvbnN0ZXhwciBib29sIGhhc0V4YWN0bHlPbmVC aXRTZXQoKSBjb25zdApJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0NoYW5nZUxvZwkocmV2aXNpb24gMjY2ODA3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDktMDkgIFJ5b3N1a2UgTml3YSAgPHJuaXdh QHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2ltcGx5IE9wdGlvblNldDo6c2V0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYzMzUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIHVuaXQgdGVzdCBm b3IgT3B0aW9uU2V0OjpzZXQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9P cHRpb25TZXQuY3BwOgorICAgICAgICAoV1RGX09wdGlvblNldC5TZXQpOgorCiAyMDIwLTA5LTA5 ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBld3MgbWln aHQgbWFyayBidWlsZCBhcyBzdWNjZXNzZnVsIGlmIHRlc3RzIGZhaWwgdG8gcnVuCkluZGV4OiBU b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9PcHRpb25TZXQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL09wdGlvblNldC5jcHAJKHJldmlzaW9uIDI2 Njc3NSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL09wdGlvblNldC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEyMyw2ICsxMjMsMzEgQEAgVEVTVChXVEZfT3B0aW9uU2V0LCBBZGRB bmRSZW1vdmUpCiAgICAgRVhQRUNUX0ZBTFNFKHNldC5jb250YWlucyhFeGFtcGxlRmxhZ3M6OkMp KTsKIH0KIAorVEVTVChXVEZfT3B0aW9uU2V0LCBTZXQpCit7CisgICAgT3B0aW9uU2V0PEV4YW1w bGVGbGFncz4gc2V0OworCisgICAgc2V0LnNldChFeGFtcGxlRmxhZ3M6OkEsIHRydWUpOworICAg IEVYUEVDVF9UUlVFKHNldC5jb250YWlucyhFeGFtcGxlRmxhZ3M6OkEpKTsKKyAgICBFWFBFQ1Rf RkFMU0Uoc2V0LmNvbnRhaW5zKEV4YW1wbGVGbGFnczo6QikpOworICAgIEVYUEVDVF9GQUxTRShz ZXQuY29udGFpbnMoRXhhbXBsZUZsYWdzOjpDKSk7CisKKyAgICBzZXQuc2V0KHsgRXhhbXBsZUZs YWdzOjpCLCBFeGFtcGxlRmxhZ3M6OkMgfSwgdHJ1ZSk7CisgICAgRVhQRUNUX1RSVUUoc2V0LmNv bnRhaW5zKEV4YW1wbGVGbGFnczo6QSkpOworICAgIEVYUEVDVF9UUlVFKHNldC5jb250YWlucyhF eGFtcGxlRmxhZ3M6OkIpKTsKKyAgICBFWFBFQ1RfVFJVRShzZXQuY29udGFpbnMoRXhhbXBsZUZs YWdzOjpDKSk7CisKKyAgICBzZXQuc2V0KEV4YW1wbGVGbGFnczo6QiwgZmFsc2UpOworICAgIEVY UEVDVF9UUlVFKHNldC5jb250YWlucyhFeGFtcGxlRmxhZ3M6OkEpKTsKKyAgICBFWFBFQ1RfRkFM U0Uoc2V0LmNvbnRhaW5zKEV4YW1wbGVGbGFnczo6QikpOworICAgIEVYUEVDVF9UUlVFKHNldC5j b250YWlucyhFeGFtcGxlRmxhZ3M6OkMpKTsKKworICAgIHNldC5zZXQoeyBFeGFtcGxlRmxhZ3M6 OkEsIEV4YW1wbGVGbGFnczo6QyB9LCBmYWxzZSk7CisgICAgRVhQRUNUX0ZBTFNFKHNldC5jb250 YWlucyhFeGFtcGxlRmxhZ3M6OkEpKTsKKyAgICBFWFBFQ1RfRkFMU0Uoc2V0LmNvbnRhaW5zKEV4 YW1wbGVGbGFnczo6QikpOworICAgIEVYUEVDVF9GQUxTRShzZXQuY29udGFpbnMoRXhhbXBsZUZs YWdzOjpDKSk7Cit9CisKIFRFU1QoV1RGX09wdGlvblNldCwgQ29udGFpbnNUd29GbGFncykKIHsK ICAgICBPcHRpb25TZXQ8RXhhbXBsZUZsYWdzPiBzZXQgeyBFeGFtcGxlRmxhZ3M6OkEsIEV4YW1w bGVGbGFnczo6QiB9Owo=