Changeset 36701 in webkit for trunk/JavaScriptCore/kjs/StructureID.cpp

Timestamp:

Sep 19, 2008, 9:35:33 PM (17 years ago)

Author:

[email protected]

Message:

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

Roll r36694 back in. It did not cause the crash.

• 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/StructureID.cpp: (JSC::structureIDChainsAreEqual): (JSC::StructureID::getEnumerablePropertyNames): (JSC::StructureID::clearEnumerationCache): (JSC::StructureID::createCachedPrototypeChain):
• kjs/StructureID.h:

File:

• trunk/JavaScriptCore/kjs/StructureID.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -30 +30 @@
 #include "JSObject.h"
 #include "PropertyNameArray.h"
+#include "lookup.h"
 #include <wtf/RefPtr.h>
 
@@ -49 +50 @@
 }
 
-void StructureID::getEnumerablePropertyNames(PropertyNameArray& propertyNames) const
-{
-    if (m_cachedPropertyNameArray.isEmpty())
-        m_propertyMap.getEnumerablePropertyNames(m_cachedPropertyNameArray);
-
-    if (!propertyNames.size()) {
-        for (size_t i = 0; i < m_cachedPropertyNameArray.size(); ++i)
-            propertyNames.addKnownUnique(m_cachedPropertyNameArray[i]);
-    } else {
-        for (size_t i = 0; i < m_cachedPropertyNameArray.size(); ++i)
-            propertyNames.add(m_cachedPropertyNameArray[i]);
-    }
+static bool structureIDChainsAreEqual(StructureIDChain* chainA, StructureIDChain* chainB)
+{
+    if (!chainA || !chainB)
+        return false;
+
+    RefPtr<StructureID>* a = chainA->head();
+    RefPtr<StructureID>* b = chainB->head();
+    while (1) {
+        if (*a != *b)
+            return false;
+        if (!*a)
+            return true;
+        a++;
+        b++;
+    }
+}
+
+void StructureID::getEnumerablePropertyNames(ExecState* exec, PropertyNameArray& propertyNames, JSObject* baseObject)
+{
+    bool shouldCache = !(propertyNames.size() || m_isDictionary);
+
+    if (shouldCache && m_cachedPropertyNameArrayData) {
+        if (structureIDChainsAreEqual(m_cachedPropertyNameArrayData->cachedPrototypeChain(), cachedPrototypeChain())) {
+            propertyNames.setData(m_cachedPropertyNameArrayData);
+            return;
+        }
+    }
+
+    m_propertyMap.getEnumerablePropertyNames(propertyNames);
+
+    // Add properties from the static hashtables of properties
+    for (const ClassInfo* info = baseObject->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 (m_prototype->isObject())
+        static_cast<JSObject*>(m_prototype)->getPropertyNames(exec, propertyNames);
+
+    if (shouldCache) {
+        m_cachedPropertyNameArrayData = propertyNames.data();
+
+        StructureIDChain* chain = cachedPrototypeChain();
+        if (!chain)
+            chain = createCachedPrototypeChain();
+        m_cachedPropertyNameArrayData->setCachedPrototypeChain(chain);
+    }
+}
+
+void StructureID::clearEnumerationCache()
+{
+    m_cachedPropertyNameArrayData.clear();
 }
 
@@ -151 +201 @@
 }
 
+StructureIDChain* StructureID::createCachedPrototypeChain()
+{
+    ASSERT(m_type == ObjectType);
+    ASSERT(!m_cachedPrototypeChain);
+
+    JSValue* prototype = storedPrototype();
+    if (JSImmediate::isImmediate(prototype))
+        return 0;
+
+    RefPtr<StructureIDChain> chain = StructureIDChain::create(static_cast<JSObject*>(prototype)->structureID());
+    setCachedPrototypeChain(chain.release());
+    return cachedPrototypeChain();
+}
+
 StructureIDChain::StructureIDChain(StructureID* structureID)
 {