234368 2021-12-15 15:22:18 -0800 Support passing an old-style enum to add(Hasher&, ...) 2021-12-15 17:20:17 -0800 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=234314 InRadar P2 Normal --- 1 cdumez cdumez benjamin cmarcelo darin ews-watchlist webkit-bug-importer oldest_to_newest 1824556 0 cdumez 2021-12-15 15:22:18 -0800 Support passing an old-style enum to add(Hasher&, ...). Currently, it works for enum classes but leads to ambiguity errors with some compiler when passing a plain enum: /Volumes/Data/worker/production-archive/build/build-Production/MacOSX.platform/WebKit_OpenSource.roots/Sources/WebKit/Source/WebCore/platform/network/ProtectionSpaceHash.h:40:9: error: call to 'add' is ambiguous add(hasher, protectionSpace.serverType()); In file included from /Volumes/Data/worker/production-archive/build/build-Production/MacOSX.platform/WebKit_OpenSource.roots/BuildRecords/WebCore_install/Symbols/BuiltProducts/DerivedSources/WebCore/unified-sources/UnifiedSource43-mm.mm:5: In file included from ./platform/network/mac/CookieStorageMac.mm:30: In file included from /Volumes/Data/worker/production-archive/build/build-Production/MacOSX.platform/WebKit_OpenSource.roots/Sources/WebKit/Source/WebCore/platform/network/NetworkStorageSession.h:28: In file included from /Volumes/Data/worker/production-archive/build/build-Production/MacOSX.platform/WebKit_OpenSource.roots/Sources/WebKit/Source/WebCore/platform/network/CredentialStorage.h:29: In file included from /Volumes/Data/worker/production-archive/build/build-Production/MacOSX.platform/WebKit_OpenSource.roots/Sources/WebKit/Source/WebCore/platform/network/ProtectionSpaceHash.h:30: /Volumes/Data/worker/production-archive/build/build-Production/MacOSX.platform/WebKit_OpenSource.roots/SDKs/MacOSX11.5.Internal.sdk/usr/local/include/wtf/Hasher.h:34:148: note: candidate function [with UnsignedInteger = WebCore::ProtectionSpaceServerType] template<typename UnsignedInteger> std::enable_if_t<std::is_unsigned<UnsignedInteger>::value && sizeof(UnsignedInteger) <= sizeof(uint32_t), void> add(Hasher&, UnsignedInteger); /Volumes/Data/worker/production-archive/build/build-Production/MacOSX.platform/WebKit_OpenSource.roots/SDKs/MacOSX11.5.Internal.sdk/usr/local/include/wtf/Hasher.h:126:89: note: candidate function [with Enumeration = WebCore::ProtectionSpaceServerType] template<typename Enumeration> std::enable_if_t<std::is_enum<Enumeration>::value, void> add(Hasher& hasher, Enumeration value) 1824558 1 447290 cdumez 2021-12-15 15:29:02 -0800 Created attachment 447290 Patch 1824604 2 ews-feeder 2021-12-15 17:19:22 -0800 Committed r287120 (245304@main): <https://commits.webkit.org/245304@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447290. 1824605 3 webkit-bug-importer 2021-12-15 17:20:17 -0800 <rdar://problem/86550827> 447290 2021-12-15 15:29:02 -0800 2021-12-15 17:19:24 -0800 Patch bug-234368-20211215152902.patch text/plain 4588 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDFkZTI5MzJmYmUyOTJkYjUxMmVlMTY0 MzRiNGQ4NWMyYTMzODlmYjUuLjcyYzBlYjM3NTU1MGEyMDdkYWZiNTFhNzZiMTVlYTYzZDA5OTFj YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMTItMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBTdXBwb3J0IHBhc3NpbmcgYW4gb2xkLXN0eWxlIGVudW0g dG8gYWRkKEhhc2hlciYsIC4uLikKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNDM2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFN1cHBvcnQgcGFzc2luZyBhbiBvbGQtc3R5bGUgZW51bSB0byBhZGQoSGFz aGVyJiwgLi4uKS4gUHJldmlvdXNseSwgaXQgd291bGQgd29yayBmb3IgZW51bSBjbGFzc2VzCisg ICAgICAgIGJ1dCBsZWFkIHRvIGFtYmlndWl0eSBlcnJvcnMgd2l0aCBzb21lIGNvbXBpbGVyIHdo ZW4gcGFzc2luZyBhIHBsYWluIGVudW0uCisKKyAgICAgICAgKiB3dGYvSGFzaGVyLmg6CisgICAg ICAgIChXVEY6Okhhc2hlcjo6YWRkKToKKyAgICAgICAgKFdURjo6YWRkKToKKwogMjAyMS0xMi0x NSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBBZG9w dCAtW05TU2NyZWVuIHNhZmVBcmVhSW5zZXRzXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGE2NzFlODg2OGQwMGNk NjY1NGE1OWVlOWQ1Y2NmZjRjOTZiZTQwYTQuLjQwMTg1NTE5ZjVkN2Q2M2E1YmU3YjhhMmU0MTU3 NjdmZDA0YTVkMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0xMi0xNSAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFN1cHBvcnQgcGFzc2luZyBh biBvbGQtc3R5bGUgZW51bSB0byBhZGQoSGFzaGVyJiwgLi4uKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MzY4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRHJvcCBzdGF0aWNfY2FzdHMgdGhhdCBzaG91 bGQgbm8gbG9uZ2VyIGJlIG5lZWRlZCBub3cgdGhhdCB3ZSBjYW4gcGFzcworICAgICAgICBhbiBl bnVtIHRvIGFkZChIYXNoZXImLCAuLi4pLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9Q cm90ZWN0aW9uU3BhY2VIYXNoLmg6CisgICAgICAgIChXZWJDb3JlOjpQcm90ZWN0aW9uU3BhY2VI YXNoOjpoYXNoKToKKwogMjAyMS0xMi0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIyODcwNzcuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV1RGL3d0Zi9IYXNoZXIuaCBiL1NvdXJjZS9XVEYvd3RmL0hhc2hlci5oCmlu ZGV4IGY0MGZkZWY5YjQ2YmQ1MjFkMTk4ZjY0Y2FjNzZhZWY4YzI3MDU3YTkuLjViM2UwNzk0Mzgx NTY0M2M5Y2QxOGJhMWIzMjNhYTdhMmJmZTQ5ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3Rm L0hhc2hlci5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0hhc2hlci5oCkBAIC0zMSw3ICszMSw3IEBA IG5hbWVzcGFjZSBXVEYgewogCiB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBUeXBlcz4gdWludDMyX3Qg Y29tcHV0ZUhhc2goY29uc3QgVHlwZXMmLi4uKTsKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVu YW1lLi4uIE90aGVyVHlwZXM+IHVpbnQzMl90IGNvbXB1dGVIYXNoKHN0ZDo6aW5pdGlhbGl6ZXJf bGlzdDxUPiwgc3RkOjppbml0aWFsaXplcl9saXN0PE90aGVyVHlwZXM+Li4uKTsKLXRlbXBsYXRl PHR5cGVuYW1lIFVuc2lnbmVkSW50ZWdlcj4gc3RkOjplbmFibGVfaWZfdDxzdGQ6OmlzX3Vuc2ln bmVkPFVuc2lnbmVkSW50ZWdlcj46OnZhbHVlICYmIHNpemVvZihVbnNpZ25lZEludGVnZXIpIDw9 IHNpemVvZih1aW50MzJfdCksIHZvaWQ+IGFkZChIYXNoZXImLCBVbnNpZ25lZEludGVnZXIpOwor dGVtcGxhdGU8dHlwZW5hbWUgVW5zaWduZWRJbnRlZ2VyPiBzdGQ6OmVuYWJsZV9pZl90PHN0ZDo6 aXNfdW5zaWduZWRfdjxVbnNpZ25lZEludGVnZXI+ICYmIHNpemVvZihVbnNpZ25lZEludGVnZXIp IDw9IHNpemVvZih1aW50MzJfdCkgJiYgIXN0ZDo6aXNfZW51bV92PFVuc2lnbmVkSW50ZWdlcj4s IHZvaWQ+IGFkZChIYXNoZXImLCBVbnNpZ25lZEludGVnZXIpOwogCiBjbGFzcyBIYXNoZXIgewog ICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwpAQCAtNTEsNyArNTEsNyBAQCBwdWJsaWM6CiAg ICAgICAgIHJldHVybiBoYXNoZXIubV91bmRlcmx5aW5nSGFzaGVyLmhhc2goKTsKICAgICB9CiAK LSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVbnNpZ25lZEludGVnZXI+IGZyaWVuZCBzdGQ6OmVuYWJs ZV9pZl90PHN0ZDo6aXNfdW5zaWduZWQ8VW5zaWduZWRJbnRlZ2VyPjo6dmFsdWUgJiYgc2l6ZW9m KFVuc2lnbmVkSW50ZWdlcikgPD0gc2l6ZW9mKHVpbnQzMl90KSwgdm9pZD4gYWRkKEhhc2hlciYg aGFzaGVyLCBVbnNpZ25lZEludGVnZXIgaW50ZWdlcikKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBV bnNpZ25lZEludGVnZXI+IGZyaWVuZCBzdGQ6OmVuYWJsZV9pZl90PHN0ZDo6aXNfdW5zaWduZWRf djxVbnNpZ25lZEludGVnZXI+ICYmIHNpemVvZihVbnNpZ25lZEludGVnZXIpIDw9IHNpemVvZih1 aW50MzJfdCkgJiYgIXN0ZDo6aXNfZW51bV92PFVuc2lnbmVkSW50ZWdlcj4sIHZvaWQ+IGFkZChI YXNoZXImIGhhc2hlciwgVW5zaWduZWRJbnRlZ2VyIGludGVnZXIpCiAgICAgewogICAgICAgICAv LyBXZSBjYW4gY29uc2lkZXIgYWRkaW5nIGEgbW9yZSBlZmZpY2llbnQgY29kZSBwYXRoIGZvciBo YXNoaW5nIGJvb2xlYW5zIG9yIGluZGl2aWR1YWwgYnl0ZXMgaWYgbmVlZGVkLgogICAgICAgICAv LyBXZSBjYW4gY29uc2lkZXIgYWRkaW5nIGEgbW9yZSBlZmZpY2llbnQgY29kZSBwYXRoIGZvciBo YXNoaW5nIDE2LWJpdCB2YWx1ZXMgaWYgbmVlZGVkLCBwZXJoYXBzIHVzaW5nIGFkZENoYXJhY3Rl ciwKQEAgLTEyMyw3ICsxMjMsNyBAQCBpbmxpbmUgdm9pZCBhZGQoSGFzaGVyJiBoYXNoZXIsIGNv bnN0IFVSTCYgdXJsKQogICAgIGFkZChoYXNoZXIsIHVybC5zdHJpbmcoKSk7CiB9CiAKLXRlbXBs YXRlPHR5cGVuYW1lIEVudW1lcmF0aW9uPiBzdGQ6OmVuYWJsZV9pZl90PHN0ZDo6aXNfZW51bTxF bnVtZXJhdGlvbj46OnZhbHVlLCB2b2lkPiBhZGQoSGFzaGVyJiBoYXNoZXIsIEVudW1lcmF0aW9u IHZhbHVlKQordGVtcGxhdGU8dHlwZW5hbWUgRW51bWVyYXRpb24+IHN0ZDo6ZW5hYmxlX2lmX3Q8 c3RkOjppc19lbnVtX3Y8RW51bWVyYXRpb24+LCB2b2lkPiBhZGQoSGFzaGVyJiBoYXNoZXIsIEVu dW1lcmF0aW9uIHZhbHVlKQogewogICAgIGFkZChoYXNoZXIsIHN0YXRpY19jYXN0PHN0ZDo6dW5k ZXJseWluZ190eXBlX3Q8RW51bWVyYXRpb24+Pih2YWx1ZSkpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Qcm90ZWN0aW9uU3BhY2VIYXNoLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Byb3RlY3Rpb25TcGFjZUhhc2guaAppbmRleCA2 NDExNGIwZTk5M2I4NDZiZjZkOGI2NTEyM2FjNjRjODBjYWQzYWMwLi41YTM1N2QzN2NkZjZkNDU1 MGYwMTRlMGM0ZWE1YmIzOTY4NjgwZmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL1Byb3RlY3Rpb25TcGFjZUhhc2guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL1Byb3RlY3Rpb25TcGFjZUhhc2guaApAQCAtMzcsOCArMzcsOCBAQCBz dHJ1Y3QgUHJvdGVjdGlvblNwYWNlSGFzaCB7CiAgICAgICAgIEhhc2hlciBoYXNoZXI7CiAgICAg ICAgIGFkZChoYXNoZXIsIHByb3RlY3Rpb25TcGFjZS5ob3N0KCkpOwogICAgICAgICBhZGQoaGFz aGVyLCBwcm90ZWN0aW9uU3BhY2UucG9ydCgpKTsKLSAgICAgICAgYWRkKGhhc2hlciwgc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KHByb3RlY3Rpb25TcGFjZS5zZXJ2ZXJUeXBlKCkpKTsKLSAgICAgICAg YWRkKGhhc2hlciwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHByb3RlY3Rpb25TcGFjZS5hdXRoZW50 aWNhdGlvblNjaGVtZSgpKSk7CisgICAgICAgIGFkZChoYXNoZXIsIHByb3RlY3Rpb25TcGFjZS5z ZXJ2ZXJUeXBlKCkpOworICAgICAgICBhZGQoaGFzaGVyLCBwcm90ZWN0aW9uU3BhY2UuYXV0aGVu dGljYXRpb25TY2hlbWUoKSk7CiAgICAgICAgIGlmICghcHJvdGVjdGlvblNwYWNlLmlzUHJveHko KSkKICAgICAgICAgICAgIGFkZChoYXNoZXIsIHByb3RlY3Rpb25TcGFjZS5yZWFsbSgpKTsKICAg ICAgICAgcmV0dXJuIGhhc2hlci5oYXNoKCk7Cg==