Changeset 53912 in webkit for trunk/JavaScriptCore/wtf/HashTable.h

Timestamp:

Jan 27, 2010, 1:06:28 AM (15 years ago)

Author:

[email protected]

Message:

Revert r53899 (HashMap<AtomicStringImpl*, Value> key checks) and subsequent bug fixes,
because they make SVG tests crash in release builds.

File:

• trunk/JavaScriptCore/wtf/HashTable.h (modified) (15 diffs)

trunk/JavaScriptCore/wtf/HashTable.h

@@ -31 +31 @@
 
 #define DUMP_HASHTABLE_STATS 0
-// Enables internal WTF consistency checks that are invoked automatically. Non-WTF callers can call checkTableConsistency() even if internal checks are disabled.
 #define CHECK_HASHTABLE_CONSISTENCY 0
 
@@ -342 +341 @@
         template<typename T, typename HashTranslator> ValueType* lookup(const T&);
 
-#if !ASSERT_DISABLED
+#if CHECK_HASHTABLE_CONSISTENCY
         void checkTableConsistency() const;
 #else
         static void checkTableConsistency() { }
-#endif
-#if CHECK_HASHTABLE_CONSISTENCY
-        void internalCheckTableConsistency() const { checkTableConsistency(); }
-        void internalCheckTableConsistencyExceptSize() const { checkTableConsistencyExceptSize(); }
-#else
-        static void internalCheckTableConsistencyExceptSize() { }
-        static void internalCheckTableConsistency() { }
 #endif
 
@@ -392 +384 @@
         const_iterator makeKnownGoodConstIterator(ValueType* pos) const { return const_iterator(this, pos, m_table + m_tableSize, HashItemKnownGood); }
 
-#if !ASSERT_DISABLED
+#if CHECK_HASHTABLE_CONSISTENCY
         void checkTableConsistencyExceptSize() const;
 #else
@@ -633 +625 @@
             expand();
 
-        internalCheckTableConsistency();
+        checkTableConsistency();
 
         ASSERT(m_table);
@@ -702 +694 @@
         }
         
-        internalCheckTableConsistency();
+        checkTableConsistency();
         
         return std::make_pair(makeKnownGoodIterator(entry), true);
@@ -718 +710 @@
             expand();
 
-        internalCheckTableConsistency();
+        checkTableConsistency();
 
         FullLookupType lookupResult = fullLookupForWriting<T, HashTranslator>(key);
@@ -747 +739 @@
         }
 
-        internalCheckTableConsistency();
+        checkTableConsistency();
 
         return std::make_pair(makeKnownGoodIterator(entry), true);
@@ -814 +806 @@
     {
         invalidateIterators();
-        internalCheckTableConsistency();
+        checkTableConsistency();
         remove(pos);
     }
@@ -832 +824 @@
             shrink();
 
-        internalCheckTableConsistency();
+        checkTableConsistency();
     }
 
@@ -901 +893 @@
     void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::rehash(int newTableSize)
     {
-        internalCheckTableConsistencyExceptSize();
+        checkTableConsistencyExceptSize();
 
         int oldTableSize = m_tableSize;
@@ -923 +915 @@
         deallocateTable(oldTable, oldTableSize);
 
-        internalCheckTableConsistency();
+        checkTableConsistency();
     }
 
@@ -990 +982 @@
     }
 
-#if !ASSERT_DISABLED
+#if CHECK_HASHTABLE_CONSISTENCY
 
     template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
@@ -996 +988 @@
     {
         checkTableConsistencyExceptSize();
-        ASSERT(!m_table || !shouldExpand());
+        ASSERT(!shouldExpand());
         ASSERT(!shouldShrink());
     }
@@ -1021 +1013 @@
             ASSERT(entry == it.m_position);
             ++count;
-
-            KeyTraits::checkValueConsistency(it->first);
         }
 
@@ -1032 +1022 @@
     }
 
-#endif // ASSERT_DISABLED
+#endif // CHECK_HASHTABLE_CONSISTENCY
 
 #if CHECK_HASHTABLE_ITERATORS