189538 2018-09-11 23:38:19 -0700 [Win][Clang][WebKitLegacy] Fix compilation errors and warnings of WebPreferences.cpp 2018-09-12 19:16:32 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 171618 1 fujii fujii achristensen bfulgham ews-watchlist pvollan webkit-bug-importer oldest_to_newest 1458886 0 fujii 2018-09-11 23:38:19 -0700 [Win][Clang][WebKitLegacy] Fix compilation errors and warnings of WebPreferences.cpp While trying to build WebKit WinCairo port with the latest Clang (Bug 171618), the following compilation errors and warnings are reported. > [8/31] Building CXX object Source\WebKitLegacy\CMakeFiles\WebKitLegacy.dir\win\WebPreferences.cpp.obj > FAILED: Source/WebKitLegacy/CMakeFiles/WebKitLegacy.dir/win/WebPreferences.cpp.obj > C:\tools\llvm\bin\clang-cl.exe (...) -c ..\..\Source\WebKitLegacy\win\WebPreferences.cpp > In file included from ..\..\Source\WebKitLegacy\win\WebPreferences.cpp:27: > ..\..\Source\WebKitLegacy\win/WebKitDLL.h(53,37): warning: 'gClassNameCount' has C-linkage specified, but returns user-defined type 'HashCountedSet<WTF::String> &' which is incompatible with C [-Wreturn-type-c-linkage] > extern HashCountedSet<WTF::String>& gClassNameCount(); > ^ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(518,26): error: cannot initialize a variable of type 'CFPropertyListFormat' with an rvalue of type 'long long' > CFPropertyListFormat format = kCFPropertyListBinaryFormat_v1_0 | kCFPropertyListXMLFormat_v1_0; > ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(1355,15): warning: initialization of pointer of type 'BOOL *' (aka 'int *') to null from a constant boolean expression [-Wbool-conversion] > enabled = false; > ^~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(83,9): error: no matching function for call to 'CFNumberGetValue' > CFNumberGetValue(static_cast<CFNumberRef>(value), CFNumberTraits<NumberType>::Type, &val); > ^~~~~~~~~~~~~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(98,12): note: in instantiation of function template specialization 'numberValueForPreferencesValue<int>' requested here > return numberValueForPreferencesValue<int>(value); > ^ > C:\webkit\ga\WebKitBuild\Debug\..\..\WebKitLibraries\win\include\CoreFoundation\CFNumber.h(133,9): note: candidate function not viable: no known conversion from 'const unsigned int' to 'CFNumberType' for 2nd argument > Boolean CFNumberGetValue(CFNumberRef number, CFNumberType theType, void *valuePtr); > ^ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(83,9): error: no matching function for call to 'CFNumberGetValue' > CFNumberGetValue(static_cast<CFNumberRef>(value), CFNumberTraits<NumberType>::Type, &val); > ^~~~~~~~~~~~~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(409,12): note: in instantiation of function template specialization 'numberValueForPreferencesValue<float>' requested here > return numberValueForPreferencesValue<float>(valueForKey(key).get()); > ^ > C:\webkit\ga\WebKitBuild\Debug\..\..\WebKitLibraries\win\include\CoreFoundation\CFNumber.h(133,9): note: candidate function not viable: no known conversion from 'const unsigned int' to 'CFNumberType' for 2nd argument > Boolean CFNumberGetValue(CFNumberRef number, CFNumberType theType, void *valuePtr); > ^ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(83,9): error: no matching function for call to 'CFNumberGetValue' > CFNumberGetValue(static_cast<CFNumberRef>(value), CFNumberTraits<NumberType>::Type, &val); > ^~~~~~~~~~~~~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(414,12): note: in instantiation of function template specialization 'numberValueForPreferencesValue<long long>' requested here > return numberValueForPreferencesValue<LONGLONG>(valueForKey(key).get()); > ^ > C:\webkit\ga\WebKitBuild\Debug\..\..\WebKitLibraries\win\include\CoreFoundation\CFNumber.h(133,9): note: candidate function not viable: no known conversion from 'const unsigned int' to 'CFNumberType' for 2nd argument > Boolean CFNumberGetValue(CFNumberRef number, CFNumberType theType, void *valuePtr); > ^ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(93,20): error: no matching function for call to 'CFNumberCreate' > return adoptCF(CFNumberCreate(0, CFNumberTraits<NumberType>::Type, &value)); > ^~~~~~~~~~~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(435,25): note: in instantiation of function template specialization 'cfNumber<int>' requested here > setValueForKey(key, cfNumber(value).get()); > ^ > C:\webkit\ga\WebKitBuild\Debug\..\..\WebKitLibraries\win\include\CoreFoundation\CFNumber.h(102,13): note: candidate function not viable: no known conversion from 'const unsigned int' to 'CFNumberType' for 2nd argument > CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType theType, const void *valuePtr); > ^ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(93,20): error: no matching function for call to 'CFNumberCreate' > return adoptCF(CFNumberCreate(0, CFNumberTraits<NumberType>::Type, &value)); > ^~~~~~~~~~~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(445,25): note: in instantiation of function template specialization 'cfNumber<float>' requested here > setValueForKey(key, cfNumber(value).get()); > ^ > C:\webkit\ga\WebKitBuild\Debug\..\..\WebKitLibraries\win\include\CoreFoundation\CFNumber.h(102,13): note: candidate function not viable: no known conversion from 'const unsigned int' to 'CFNumberType' for 2nd argument > CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType theType, const void *valuePtr); > ^ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(93,20): error: no matching function for call to 'CFNumberCreate' > return adoptCF(CFNumberCreate(0, CFNumberTraits<NumberType>::Type, &value)); > ^~~~~~~~~~~~~~ > ..\..\Source\WebKitLegacy\win\WebPreferences.cpp(465,25): note: in instantiation of function template specialization 'cfNumber<long long>' requested here > setValueForKey(key, cfNumber(value).get()); > ^ > C:\webkit\ga\WebKitBuild\Debug\..\..\WebKitLibraries\win\include\CoreFoundation\CFNumber.h(102,13): note: candidate function not viable: no known conversion from 'const unsigned int' to 'CFNumberType' for 2nd argument > CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType theType, const void *valuePtr); > ^ > 2 warnings and 7 errors generated. 1458887 1 349527 fujii 2018-09-11 23:58:20 -0700 Created attachment 349527 Patch 1458888 2 ews-watchlist 2018-09-11 23:59:56 -0700 Attachment 349527 did not pass style-queue: ERROR: Source/WebKitLegacy/win/WebPreferences.cpp:64: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebKitLegacy/win/WebPreferences.cpp:65: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebKitLegacy/win/WebPreferences.cpp:66: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebKitLegacy/win/WebPreferences.cpp:67: More than one command on the same line [whitespace/newline] [4] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1458966 3 349527 pvollan 2018-09-12 09:06:52 -0700 Comment on attachment 349527 Patch R=me. 1459225 4 349527 fujii 2018-09-12 19:15:00 -0700 Comment on attachment 349527 Patch Clearing flags on attachment: 349527 Committed r235966: <https://trac.webkit.org/changeset/235966> 1459226 5 fujii 2018-09-12 19:15:03 -0700 All reviewed patches have been landed. Closing bug. 1459230 6 webkit-bug-importer 2018-09-12 19:16:32 -0700 <rdar://problem/44403488> 349527 2018-09-11 23:58:20 -0700 2018-09-12 19:15:00 -0700 Patch bug-189538-20180912155819.patch text/plain 3124 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5k ZXggNWVkMThhMzE0ZTgxYWFhODVlOTI3ZTU3ZmZkZTk1MDdhNTU3NDRiYi4uMjdjOTI2NDIyODEx Yjk2MDY4OGIwZjY2ZDU1MmIzYmEzZGIyMzE1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExl Z2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDE4LTA5LTExICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp LkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dW0NsYW5nXVtXZWJLaXRMZWdhY3ldIEZp eCBjb21waWxhdGlvbiBlcnJvcnMgYW5kIHdhcm5pbmdzIG9mIFdlYlByZWZlcmVuY2VzLmNwcAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NTM4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcmVm ZXJlbmNlcy5jcHA6CisgICAgICAgIENoYW5nZWQgdGhlIHR5cGUgb2YgQ0ZOdW1iZXJUcmFpdHM6 OlR5cGUgZnJvbSB1bnNpZ25lZCBpbnQgdG8gQ0ZOdW1iZXJUeXBlLgorICAgICAgICAoV2ViUHJl ZmVyZW5jZXM6Om1pZ3JhdGVXZWJLaXRQcmVmZXJlbmNlc1RvQ0ZQcmVmZXJlbmNlcyk6CisgICAg ICAgIEFwcGx5IHN0YXRpY19jYXN0IHRvIHRoZSByZXN1bHQgb2YgT1ItZWQgQ0ZQcm9wZXJ0eUxp c3RGb3JtYXQuCisgICAgICAgIChXZWJQcmVmZXJlbmNlczo6c2NyZWVuRm9udFN1YnN0aXR1dGlv bkVuYWJsZWQpOgorICAgICAgICBBc3NpZ24gZmFsc2UgdG8gdGhlIGNvbnRlbnQgb2YgdGhlIG91 dCB2YXJpYWJsZSAnZW5hYmxlZCcsIG5vdCBhc3NpZ25pbmcgMCB0byB0aGUgdmFyaWFibGUuCisK IDIwMTgtMDktMDYgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVmYWN0b3IgV2ViQ29yZTo6RWRpdEFjdGlvbiB0byBiZSBhbiA4LWJpdCBlbnVtIGNs YXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5j cHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5jcHAKaW5kZXggZjFk ODFkODNkY2NmNzU1ZWU3NDdkY2VmMzRhN2ExOGRkYTZhZDdjNC4uZmVlZDQxOTFlMmI3YTM5ZmU0 YWM2Nzc3MzQxZTk4ZDc5ZTRlOGYzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93 aW4vV2ViUHJlZmVyZW5jZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlBy ZWZlcmVuY2VzLmNwcApAQCAtNjEsMTAgKzYxLDEwIEBAIHN0YXRpYyBjb25zdCBTdHJpbmcmIG9s ZFByZWZlcmVuY2VzUGF0aCgpCiAgICAgcmV0dXJuIHBhdGg7CiB9CiAKLXRlbXBsYXRlPHR5cGVu YW1lIE51bWJlclR5cGU+IHN0cnVjdCBDRk51bWJlclRyYWl0cyB7IHN0YXRpYyBjb25zdCB1bnNp Z25lZCBUeXBlOyB9OwotdGVtcGxhdGU8PiBzdHJ1Y3QgQ0ZOdW1iZXJUcmFpdHM8aW50PiB7IHN0 YXRpYyBjb25zdCB1bnNpZ25lZCBUeXBlID0ga0NGTnVtYmVyU0ludDMyVHlwZTsgfTsKLXRlbXBs YXRlPD4gc3RydWN0IENGTnVtYmVyVHJhaXRzPExPTkdMT05HPiB7IHN0YXRpYyBjb25zdCB1bnNp Z25lZCBUeXBlID0ga0NGTnVtYmVyTG9uZ0xvbmdUeXBlOyB9OwotdGVtcGxhdGU8PiBzdHJ1Y3Qg Q0ZOdW1iZXJUcmFpdHM8ZmxvYXQ+IHsgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFR5cGUgPSBrQ0ZO dW1iZXJGbG9hdDMyVHlwZTsgfTsKK3RlbXBsYXRlPHR5cGVuYW1lIE51bWJlclR5cGU+IHN0cnVj dCBDRk51bWJlclRyYWl0cyB7IHN0YXRpYyBjb25zdCBDRk51bWJlclR5cGUgVHlwZTsgfTsKK3Rl bXBsYXRlPD4gc3RydWN0IENGTnVtYmVyVHJhaXRzPGludD4geyBzdGF0aWMgY29uc3QgQ0ZOdW1i ZXJUeXBlIFR5cGUgPSBrQ0ZOdW1iZXJTSW50MzJUeXBlOyB9OwordGVtcGxhdGU8PiBzdHJ1Y3Qg Q0ZOdW1iZXJUcmFpdHM8TE9OR0xPTkc+IHsgc3RhdGljIGNvbnN0IENGTnVtYmVyVHlwZSBUeXBl ID0ga0NGTnVtYmVyTG9uZ0xvbmdUeXBlOyB9OwordGVtcGxhdGU8PiBzdHJ1Y3QgQ0ZOdW1iZXJU cmFpdHM8ZmxvYXQ+IHsgc3RhdGljIGNvbnN0IENGTnVtYmVyVHlwZSBUeXBlID0ga0NGTnVtYmVy RmxvYXQzMlR5cGU7IH07CiAKIHRlbXBsYXRlPHR5cGVuYW1lIE51bWJlclR5cGU+CiBzdGF0aWMg TnVtYmVyVHlwZSBudW1iZXJWYWx1ZUZvclByZWZlcmVuY2VzVmFsdWUoQ0ZQcm9wZXJ0eUxpc3RS ZWYgdmFsdWUpCkBAIC01MTUsNyArNTE1LDcgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6bWlncmF0 ZVdlYktpdFByZWZlcmVuY2VzVG9DRlByZWZlcmVuY2VzKCkKICAgICBpZiAoIUNGUmVhZFN0cmVh bU9wZW4oc3RyZWFtLmdldCgpKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgQ0ZQcm9wZXJ0eUxp c3RGb3JtYXQgZm9ybWF0ID0ga0NGUHJvcGVydHlMaXN0QmluYXJ5Rm9ybWF0X3YxXzAgfCBrQ0ZQ cm9wZXJ0eUxpc3RYTUxGb3JtYXRfdjFfMDsKKyAgICBhdXRvIGZvcm1hdCA9IHN0YXRpY19jYXN0 PENGUHJvcGVydHlMaXN0Rm9ybWF0PihrQ0ZQcm9wZXJ0eUxpc3RCaW5hcnlGb3JtYXRfdjFfMCB8 IGtDRlByb3BlcnR5TGlzdFhNTEZvcm1hdF92MV8wKTsKICAgICBSZXRhaW5QdHI8Q0ZQcm9wZXJ0 eUxpc3RSZWY+IHBsaXN0ID0gYWRvcHRDRihDRlByb3BlcnR5TGlzdENyZWF0ZUZyb21TdHJlYW0o MCwgc3RyZWFtLmdldCgpLCAwLCBrQ0ZQcm9wZXJ0eUxpc3RNdXRhYmxlQ29udGFpbmVyc0FuZExl YXZlcywgJmZvcm1hdCwgMCkpOwogICAgIENGUmVhZFN0cmVhbUNsb3NlKHN0cmVhbS5nZXQoKSk7 CiAKQEAgLTEzNTIsNyArMTM1Miw3IEBAIEhSRVNVTFQgV2ViUHJlZmVyZW5jZXM6OnNjcmVlbkZv bnRTdWJzdGl0dXRpb25FbmFibGVkKF9PdXRfIEJPT0wqIGVuYWJsZWQpCiB7CiAgICAgaWYgKCFl bmFibGVkKQogICAgICAgICByZXR1cm4gRV9QT0lOVEVSOwotICAgIGVuYWJsZWQgPSBmYWxzZTsK KyAgICAqZW5hYmxlZCA9IGZhbHNlOwogICAgIHJldHVybiBTX09LOwogfQogCg==