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

Timestamp:

Oct 7, 2008, 1:49:36 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-07 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Roll r37370 back in with bug fixes.

• PropertyMap::storageSize() should reflect the number of keys + deletedOffsets and has nothing to do with the internal deletedSentinel count anymore.

File:

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

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -45 +45 @@
     , m_nameInPrevious(0)
     , m_transitionCount(0)
+    , m_propertyStorageCapacity(JSObject::inlineStorageCapacity)
     , m_cachedTransistionOffset(WTF::notFound)
 {
@@ -103 +104 @@
 }
 
-void StructureID::transitionTo(StructureID* oldStructureID, StructureID* newStructureID, JSObject* slotBase)
-{
-    if (!slotBase->usingInlineStorage() && oldStructureID->m_propertyMap.size() != newStructureID->m_propertyMap.size())
-        slotBase->allocatePropertyStorage(oldStructureID->m_propertyMap.size(), newStructureID->m_propertyMap.size());
-}
-
-PassRefPtr<StructureID> StructureID::addPropertyTransition(StructureID* structureID, const Identifier& propertyName, JSValue* value, unsigned attributes, JSObject* slotBase, PutPropertySlot& slot, PropertyStorage& propertyStorage)
+void StructureID::growPropertyStorageCapacity()
+{
+    if (m_propertyStorageCapacity == JSObject::inlineStorageCapacity)
+        m_propertyStorageCapacity = JSObject::nonInlineBaseStorageCapacity;
+    else
+        m_propertyStorageCapacity *= 2;
+}
+
+PassRefPtr<StructureID> StructureID::addPropertyTransition(StructureID* structureID, const Identifier& propertyName, unsigned attributes, size_t& offset)
 {
     ASSERT(!structureID->m_isDictionary);
@@ -115 +118 @@
 
     if (StructureID* existingTransition = structureID->m_transitionTable.get(make_pair(propertyName.ustring().rep(), attributes))) {
-        if (!slotBase->usingInlineStorage() && structureID->m_propertyMap.size() != existingTransition->m_propertyMap.size())
-            slotBase->allocatePropertyStorage(structureID->m_propertyMap.size(), existingTransition->m_propertyMap.size());
-
-        size_t offset = existingTransition->cachedTransistionOffset();
+        offset = existingTransition->cachedTransistionOffset();
         ASSERT(offset != WTF::notFound);
-        propertyStorage[offset] = value;
-        slot.setNewProperty(slotBase, offset);
-
         return existingTransition;
     }
@@ -128 +125 @@
     if (structureID->m_transitionCount > s_maxTransitionLength) {
         RefPtr<StructureID> transition = toDictionaryTransition(structureID);
-        transition->m_propertyMap.put(propertyName, value, attributes, false, slotBase, slot, propertyStorage);
+        offset = transition->m_propertyMap.put(propertyName, attributes);
+        if (transition->m_propertyMap.storageSize() > transition->propertyStorageCapacity())
+            transition->growPropertyStorageCapacity();
         return transition.release();
     }
@@ -139 +138 @@
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;
-
-    size_t offset = transition->m_propertyMap.put(propertyName, value, attributes, false, slotBase, slot, propertyStorage);
+    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
+
+    offset = transition->m_propertyMap.put(propertyName, attributes);
+    if (transition->m_propertyMap.storageSize() > transition->propertyStorageCapacity())
+        transition->growPropertyStorageCapacity();
+
     transition->setCachedTransistionOffset(offset);
 
@@ -154 +157 @@
     transition->m_isDictionary = true;
     transition->m_propertyMap = structureID->m_propertyMap;
+    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
     return transition.release();
 }
@@ -173 +177 @@
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;
+    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
     return transition.release();
 }
@@ -181 +186 @@
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;
+    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
     return transition.release();
 }