Changeset 31147 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Mar 18, 2008, 9:23:21 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-03-18 Darin Adler <Darin Adler>

Reviewed by Maciej.

• Speed up JavaScript built-in properties by changing the hash table to take advantage of the identifier objects

5% speedup for Acid3 test 26

• JavaScriptCore.exp: Updated.
• kjs/create_hash_table: Compute size of hash table large enough so that there are no collisions, but don't generate the hash table.
• kjs/identifier.h: Made the add function that returns a PassRefPtr public.
• kjs/lexer.cpp: (KJS::Lexer::lex): Updated for change to HashTable interface.
• kjs/lookup.cpp: (KJS::HashTable::changeKeysToIdentifiers): Added. Finds the identifier for each property so the equality comparision can be done with pointer comparision.
• kjs/lookup.h: Made the key be a union of char* with UString::Rep* so it can hold identifiers. Added a keysAreIdentifiers flag to the HashTable. Changed the Lookup functions to be member functions of HashTable instead.
• kjs/object.cpp: (KJS::JSObject::deleteProperty): Update for change to HashTable. (KJS::JSObject::findPropertyHashEntry): Ditto. (KJS::JSObject::getPropertyAttributes): Ditto. (KJS::JSObject::getPropertyNames): Ditto.

WebCore:

2008-03-18 Darin Adler <Darin Adler>

Reviewed by Maciej.

• Speed up JavaScript built-in properties by changing the hash table to take advantage of the identifier objects

5% speedup for Acid3 test 26

• bindings/js/JSDOMWindowBase.cpp: (WebCore::JSDOMWindowBase::getOwnPropertySlot): Update for change to HashTable. (WebCore::JSDOMWindowBase::put): Ditto.
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customGetOwnPropertySlot): Ditto.
• bindings/js/JSHTMLInputElementBase.cpp: (WebCore::JSHTMLInputElementBase::getOwnPropertySlot): Ditto.
• bindings/js/JSHistoryCustom.cpp: (WebCore::JSHistory::customGetOwnPropertySlot): Ditto.
• bindings/js/JSLocation.cpp: (WebCore::JSLocation::customGetOwnPropertySlot): Ditto. (WebCore::JSLocation::put): Ditto.
• bindings/js/kjs_binding.cpp: (WebCore::nonCachingStaticFunctionGetter): Ditto.

• bindings/scripts/CodeGeneratorJS.pm: Same changes as in the create_hash_table script.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -315 +315 @@
   // Look in the static hashtable of properties
   const HashEntry* entry = findPropertyHashEntry(propertyName);
-  if (entry && entry->attr & DontDelete)
+  if (entry && entry->attributes & DontDelete)
     return false; // this builtin property can't be deleted
+  // FIXME: Should the code here actually do some deletion?
   return true;
 }
@@ -378 +379 @@
 const HashEntry* JSObject::findPropertyHashEntry(const Identifier& propertyName) const
 {
-  for (const ClassInfo *info = classInfo(); info; info = info->parentClass) {
-    if (const HashTable *propHashTable = info->propHashTable) {
-      if (const HashEntry *e = Lookup::findEntry(propHashTable, propertyName))
-        return e;
-    }
-  }
-  return 0;
+    for (const ClassInfo* info = classInfo(); info; info = info->parentClass) {
+        if (const HashTable* propHashTable = info->propHashTable) {
+            if (const HashEntry* e = propHashTable->entry(propertyName))
+                return e;
+        }
+    }
+    return 0;
 }
 
@@ -488 +489 @@
   const HashEntry* e = findPropertyHashEntry(propertyName);
   if (e) {
-    attributes = e->attr;
+    attributes = e->attributes;
     return true;
   }
@@ -497 +498 @@
 void JSObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
 {
-   _prop.getEnumerablePropertyNames(propertyNames);
-
-  // Add properties from the static hashtable of properties
-  const ClassInfo *info = classInfo();
-  while (info) {
-    if (info->propHashTable) {
-      int size = info->propHashTable->size;
-      const HashEntry *e = info->propHashTable->entries;
-      for (int i = 0; i < size; ++i, ++e) {
-        if (e->s && !(e->attr & DontEnum))
-          propertyNames.add(e->s);
-      }
-    }
-    info = info->parentClass;
-  }
-  if (_proto->isObject())
-     static_cast<JSObject*>(_proto)->getPropertyNames(exec, propertyNames);
+    _prop.getEnumerablePropertyNames(propertyNames);
+
+    // Add properties from the static hashtables of properties
+    for (const ClassInfo* info = classInfo(); info; info = info->parentClass) {
+        const HashTable* table = info->propHashTable;
+        if (!table)
+            continue;
+        if (!table->table)
+            table->createTable();
+        ASSERT(table->table);
+        int hashSizeMask = table->hashSizeMask;
+        const HashEntry* e = table->table;
+        for (int i = 0; i <= hashSizeMask; ++i, ++e) {
+            if (e->key && !(e->attributes & DontEnum))
+                propertyNames.add(Identifier(e->key));
+        }
+    }
+
+    if (_proto->isObject())
+        static_cast<JSObject*>(_proto)->getPropertyNames(exec, propertyNames);
 }