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

Timestamp:

Oct 7, 2008, 11:17:37 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-07 Cameron Zwarich <​[email protected]>

Rubber-stamped by Mark Rowe.

Roll out r37370.

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)
 {
@@ -104 +103 @@
 }
 
-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)
+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)
 {
     ASSERT(!structureID->m_isDictionary);
@@ -118 +115 @@
 
     if (StructureID* existingTransition = structureID->m_transitionTable.get(make_pair(propertyName.ustring().rep(), attributes))) {
-        offset = existingTransition->cachedTransistionOffset();
+        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();
         ASSERT(offset != WTF::notFound);
+        propertyStorage[offset] = value;
+        slot.setNewProperty(slotBase, offset);
+
         return existingTransition;
     }
@@ -125 +128 @@
     if (structureID->m_transitionCount > s_maxTransitionLength) {
         RefPtr<StructureID> transition = toDictionaryTransition(structureID);
-        offset = transition->m_propertyMap.put(propertyName, attributes);
-        if (transition->m_propertyMap.storageSize() > transition->propertyStorageCapacity())
-            transition->growPropertyStorageCapacity();
+        transition->m_propertyMap.put(propertyName, value, attributes, false, slotBase, slot, propertyStorage);
         return transition.release();
     }
@@ -138 +139 @@
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;
-    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
-
-    offset = transition->m_propertyMap.put(propertyName, attributes);
-    if (transition->m_propertyMap.storageSize() > transition->propertyStorageCapacity())
-        transition->growPropertyStorageCapacity();
-
+
+    size_t offset = transition->m_propertyMap.put(propertyName, value, attributes, false, slotBase, slot, propertyStorage);
     transition->setCachedTransistionOffset(offset);
 
@@ -157 +154 @@
     transition->m_isDictionary = true;
     transition->m_propertyMap = structureID->m_propertyMap;
-    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
     return transition.release();
 }
@@ -177 +173 @@
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;
-    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
     return transition.release();
 }
@@ -186 +181 @@
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;
-    transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
     return transition.release();
 }