Title: [248044] trunk/Source/WTF
Revision
248044
Author
[email protected]
Date
2019-07-31 09:26:57 -0700 (Wed, 31 Jul 2019)

Log Message

Fix 64-bit vs 32-bit mismatch in PersistentCoders.h
https://bugs.webkit.org/show_bug.cgi?id=200288
<rdar://problem/53734203>

Reviewed by Chris Dumez.

hashMapSize is declared as a uint64_t. It is passed to
HashMapType::reserveInitialCapacity, which takes an unsigned int. This
is a 32-bit value on 32-bit platforms, leading to a compile time
error. Fix his by casting hashMapSize to the expected type.

* wtf/persistence/PersistentCoders.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (248043 => 248044)


--- trunk/Source/WTF/ChangeLog	2019-07-31 16:13:33 UTC (rev 248043)
+++ trunk/Source/WTF/ChangeLog	2019-07-31 16:26:57 UTC (rev 248044)
@@ -1,5 +1,20 @@
 2019-07-31  Keith Rollin  <[email protected]>
 
+        Fix 64-bit vs 32-bit mismatch in PersistentCoders.h
+        https://bugs.webkit.org/show_bug.cgi?id=200288
+        <rdar://problem/53734203>
+
+        Reviewed by Chris Dumez.
+
+        hashMapSize is declared as a uint64_t. It is passed to
+        HashMapType::reserveInitialCapacity, which takes an unsigned int. This
+        is a 32-bit value on 32-bit platforms, leading to a compile time
+        error. Fix his by casting hashMapSize to the expected type.
+
+        * wtf/persistence/PersistentCoders.h:
+
+2019-07-31  Keith Rollin  <[email protected]>
+
         Fix 64-bit vs 32-bit mismatch in LogArgument
         https://bugs.webkit.org/show_bug.cgi?id=200286
         <rdar://problem/53733671>

Modified: trunk/Source/WTF/wtf/persistence/PersistentCoders.h (248043 => 248044)


--- trunk/Source/WTF/wtf/persistence/PersistentCoders.h	2019-07-31 16:13:33 UTC (rev 248043)
+++ trunk/Source/WTF/wtf/persistence/PersistentCoders.h	2019-07-31 16:26:57 UTC (rev 248044)
@@ -196,7 +196,7 @@
             return false;
 
         HashMapType tempHashMap;
-        tempHashMap.reserveInitialCapacity(hashMapSize);
+        tempHashMap.reserveInitialCapacity(static_cast<unsigned>(hashMapSize));
         for (uint64_t i = 0; i < hashMapSize; ++i) {
             KeyArg key;
             MappedArg value;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to