Changeset 2800 in webkit for trunk/JavaScriptCore/kjs/property_map.cpp

Timestamp:

Nov 21, 2002, 7:39:47 AM (23 years ago)

Author:

darin

Message:

• add self-check to property map in hopes of finding the cnet.com bug

• kjs/property_map.h: Add check() function.
• kjs/property_map.cpp: Add the checking, controlled by DO_CONSISTENCY_CHECK.

• fixed UChar interface so it's not so slow in debug builds

• kjs/ustring.h: Nothing in UChar needs to be private.

• kjs/function.cpp: (GlobalFuncImp::call):
• kjs/function_object.cpp: (FunctionObjectImp::construct):
• kjs/identifier.cpp:
• kjs/lexer.cpp: (Lexer::setCode), (Lexer::shift):
• kjs/lookup.cpp: (keysMatch):
• kjs/ustring.cpp: (UString::Rep::computeHash), (KJS::compare): Use the "uc" field instead of the "unicode()" inline function.

File:

• trunk/JavaScriptCore/kjs/property_map.cpp (modified) (10 diffs)

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -26 +26 @@
 #include "reference_list.h"
 
+#define DO_CONSISTENCY_CHECK 0
+
 // At the time I added this switch, the optimization still gave a 1.5% performance boost so I couldn't remove it.
 #define USE_SINGLE_ENTRY 1
+
+#if !DO_CONSISTENCY_CHECK
+#define check() ((void)0)
+#endif
 
 namespace KJS {
@@ -132 +138 @@
 void PropertyMap::put(const Identifier &name, ValueImp *value, int attributes)
 {
+    check();
+
     UString::Rep *rep = name._ustring.rep;
     
@@ -139 +147 @@
         if (key) {
             if (rep == key) {
-                _singleEntry.value = value;
+                _singleEntry.value = value;
                 return;
             }
@@ -148 +156 @@
             _singleEntry.attributes = attributes;
             _keyCount = 1;
+            check();
             return;
         }
@@ -173 +182 @@
     _table[i].attributes = attributes;
     ++_keyCount;
+
+    check();
 }
 
@@ -188 +199 @@
 void PropertyMap::expand()
 {
+    check();
+    
     int oldTableSize = _tableSize;
     Entry *oldTable = _table;
@@ -210 +223 @@
 
     free(oldTable);
+
+    check();
 }
 
 void PropertyMap::remove(const Identifier &name)
 {
+    check();
+
     UString::Rep *rep = name._ustring.rep;
 
@@ -225 +242 @@
             _singleEntry.key = 0;
             _keyCount = 0;
+            check();
         }
 #endif
@@ -254 +272 @@
         insert(key, _table[i].value, _table[i].attributes);
     }
+
+    check();
 }
 
@@ -329 +349 @@
 }
 
+#if DO_CONSISTENCY_CHECK
+
+void PropertyMap::check()
+{
+    int count = 0;
+    for (int j = 0; j != _tableSize; ++j) {
+        UString::Rep *rep = _table[j].key;
+        if (!rep)
+            continue;
+        int i = hash(rep);
+        while (UString::Rep *key = _table[i].key) {
+            if (rep == key)
+                break;
+            i = (i + 1) & _tableSizeMask;
+        }
+        assert(i == j);
+        count++;
+    }
+#if USE_SINGLE_ENTRY
+    if (_singleEntry.key)
+        count++;
+#endif
+    assert(count == _keyCount);
+    if (_table) {
+        assert(_tableSize);
+        assert(_tableSizeMask);
+        assert(_tableSize == _tableSizeMask + 1);
+    }
+}
+
+#endif // DO_CONSISTENCY_CHECK
+
 } // namespace KJS