Changeset 36694 in webkit for trunk/JavaScriptCore/kjs/JSObject.cpp

Timestamp:

Sep 19, 2008, 7:23:42 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-19 Sam Weinig <​[email protected]>

Reviewed by Darin Adler.

Patch for ​https://bugs.webkit.org/show_bug.cgi?id=20928
Speed up JS property enumeration by caching entire PropertyNameArray

1.3% speedup on Sunspider, 30% on string-fasta.

• JavaScriptCore.exp:
• VM/JSPropertyNameIterator.cpp: (JSC::JSPropertyNameIterator::~JSPropertyNameIterator): (JSC::JSPropertyNameIterator::invalidate):
• VM/JSPropertyNameIterator.h: (JSC::JSPropertyNameIterator::JSPropertyNameIterator): (JSC::JSPropertyNameIterator::create):
• kjs/JSObject.cpp: (JSC::JSObject::getPropertyNames):
• kjs/PropertyMap.cpp: (JSC::PropertyMap::getEnumerablePropertyNames):
• kjs/PropertyMap.h:
• kjs/PropertyNameArray.cpp: (JSC::PropertyNameArray::add):
• kjs/PropertyNameArray.h: (JSC::PropertyNameArrayData::create): (JSC::PropertyNameArrayData::propertyNameVector): (JSC::PropertyNameArrayData::setCachedPrototypeChain): (JSC::PropertyNameArrayData::cachedPrototypeChain): (JSC::PropertyNameArrayData::begin): (JSC::PropertyNameArrayData::end): (JSC::PropertyNameArrayData::PropertyNameArrayData): (JSC::PropertyNameArray::PropertyNameArray): (JSC::PropertyNameArray::addKnownUnique): (JSC::PropertyNameArray::size): (JSC::PropertyNameArray::operator[]): (JSC::PropertyNameArray::begin): (JSC::PropertyNameArray::end): (JSC::PropertyNameArray::setData): (JSC::PropertyNameArray::data): (JSC::PropertyNameArray::releaseData):
• kjs/ScopeChain.cpp: (JSC::ScopeChainNode::print):
• kjs/StructureID.cpp: (JSC::structureIDChainsAreEqual): (JSC::StructureID::getEnumerablePropertyNames): (JSC::StructureID::clearEnumerationCache): (JSC::StructureID::createCachedPrototypeChain):
• kjs/StructureID.h:

File:

• trunk/JavaScriptCore/kjs/JSObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -433 +433 @@
 void JSObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
 {
-    m_structureID->getEnumerablePropertyNames(propertyNames);
-
-    // Add properties from the static hashtables of properties
-    for (const ClassInfo* info = classInfo(); info; info = info->parentClass) {
-        const HashTable* table = info->propHashTable(exec);
-        if (!table)
-            continue;
-        table->initializeIfNeeded(exec);
-        ASSERT(table->table);
-        int hashSizeMask = table->hashSizeMask;
-        const HashEntry* entry = table->table;
-        for (int i = 0; i <= hashSizeMask; ++i, ++entry) {
-            if (entry->key && !(entry->attributes & DontEnum))
-                propertyNames.add(entry->key);
-        }
-    }
-
-    if (prototype()->isObject())
-        static_cast<JSObject*>(prototype())->getPropertyNames(exec, propertyNames);
+    m_structureID->getEnumerablePropertyNames(exec, propertyNames, this);
 }