Changeset 269017 in webkit

Timestamp:

Oct 26, 2020 7:04:13 PM (3 years ago)

Author:

Tadeu Zagallo

Message:

Assert that WTF::HashTable does not visit the same bucket twice
​https://bugs.webkit.org/show_bug.cgi?id=217691
<rdar://problem/69887843>

Reviewed by Saam Barati.

• wtf/HashTable.h:

(WTF::KeyTraits>::inlineLookup):
(WTF::KeyTraits>::lookupForWriting):
(WTF::KeyTraits>::fullLookupForWriting):
(WTF::KeyTraits>::addUniqueForInitialization):
(WTF::KeyTraits>::add):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/HashTable.h (modified) (10 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-10-13  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Assert that WTF::HashTable does not visit the same bucket twice
+        https://bugs.webkit.org/show_bug.cgi?id=217691
+        <rdar://problem/69887843>
+
+        Reviewed by Saam Barati.
+
+        * wtf/HashTable.h:
+        (WTF::KeyTraits>::inlineLookup):
+        (WTF::KeyTraits>::lookupForWriting):
+        (WTF::KeyTraits>::fullLookupForWriting):
+        (WTF::KeyTraits>::addUniqueForInitialization):
+        (WTF::KeyTraits>::add):
+
 2020-10-26  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/HashTable.h

@@ -676 +676 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
+        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -715 +716 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
+            RELEASE_ASSERT(i != initialIndex);
         }
     }
@@ -730 +732 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
+        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -776 +779 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
+            RELEASE_ASSERT(i != initialIndex);
         }
     }
@@ -791 +795 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
+        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -837 +842 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
+            RELEASE_ASSERT(i != initialIndex);
         }
     }
@@ -857 +863 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
+        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -886 +893 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
+            RELEASE_ASSERT(i != initialIndex);
         }
 
@@ -938 +946 @@
         unsigned h = HashTranslator::hash(key);
         unsigned i = h & sizeMask;
+        unsigned initialIndex = i;
 
 #if DUMP_HASHTABLE_STATS
@@ -984 +993 @@
                 k = 1 | doubleHash(h);
             i = (i + k) & sizeMask;
+            RELEASE_ASSERT(i != initialIndex);
         }