Changeset 37388 in webkit for trunk/JavaScriptCore/kjs/JSObject.h

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/JSObject.h (modified) (6 diffs)

trunk/JavaScriptCore/kjs/JSObject.h

@@ -123 +123 @@
         JSValue* getDirect(const Identifier& propertyName) const
         {
-            size_t offset = m_structureID->propertyMap().getOffset(propertyName);
+            size_t offset = m_structureID->propertyMap().get(propertyName);
             return offset != WTF::notFound ? m_propertyStorage[offset] : 0;
         }
@@ -129 +129 @@
         JSValue** getDirectLocation(const Identifier& propertyName)
         {
-            size_t offset = m_structureID->propertyMap().getOffset(propertyName);
+            size_t offset = m_structureID->propertyMap().get(propertyName);
             return offset != WTF::notFound ? locationForOffset(offset) : 0;
         }
@@ -135 +135 @@
         JSValue** getDirectLocation(const Identifier& propertyName, unsigned& attributes)
         {
-            size_t offset = m_structureID->propertyMap().getOffset(propertyName, attributes);
+            size_t offset = m_structureID->propertyMap().get(propertyName, attributes);
             return offset != WTF::notFound ? locationForOffset(offset) : 0;
         }
@@ -179 +179 @@
 
         static const size_t inlineStorageCapacity = 2;
+        static const size_t nonInlineBaseStorageCapacity = 16;
 
         static PassRefPtr<StructureID> createStructureID(JSValue* proto) { return StructureID::create(proto, TypeInfo(ObjectType)); }
@@ -365 +366 @@
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
 
-     if (m_structureID->isDictionary()) {
-         unsigned currentAttributes;
-         size_t offset = m_structureID->propertyMap().getOffset(propertyName, currentAttributes);
-         if (offset != WTF::notFound) {
-             if (checkReadOnly && currentAttributes & ReadOnly)
-                 return;
-             m_propertyStorage[offset] = value;
-             slot.setExistingProperty(this, offset);
-             return;
-         }
-
-         if (m_structureID->propertyMap().storageSize() == inlineStorageCapacity)
-             allocatePropertyStorage(m_structureID->propertyMap().storageSize(), m_structureID->propertyMap().size());
-         m_structureID->propertyMap().put(propertyName, value, attributes, checkReadOnly, this, slot, m_propertyStorage);
-         m_structureID->clearEnumerationCache();
-         return;
-     }
+    if (m_structureID->isDictionary()) {
+        unsigned currentAttributes;
+        size_t offset = m_structureID->propertyMap().get(propertyName, currentAttributes);
+        if (offset != WTF::notFound) {
+            if (checkReadOnly && currentAttributes & ReadOnly)
+                return;
+            m_propertyStorage[offset] = value;
+            slot.setExistingProperty(this, offset);
+            return;
+        }
+
+        size_t currentCapacity = m_structureID->propertyStorageCapacity();
+        offset = m_structureID->propertyMap().put(propertyName, attributes);
+        if (m_structureID->propertyMap().storageSize() > m_structureID->propertyStorageCapacity()) {
+            m_structureID->growPropertyStorageCapacity();
+            allocatePropertyStorage(currentCapacity, m_structureID->propertyStorageCapacity());
+        }
+
+        m_propertyStorage[offset] = value;
+        slot.setNewProperty(this, offset);
+        m_structureID->clearEnumerationCache();
+        return;
+    }
 
     unsigned currentAttributes;
-    size_t offset = m_structureID->propertyMap().getOffset(propertyName, currentAttributes);
+    size_t offset = m_structureID->propertyMap().get(propertyName, currentAttributes);
     if (offset != WTF::notFound) {
         if (checkReadOnly && currentAttributes & ReadOnly)
@@ -393 +400 @@
     }
 
-     if (m_structureID->propertyMap().storageSize() == inlineStorageCapacity)
-         allocatePropertyStorage(m_structureID->propertyMap().storageSize(), m_structureID->propertyMap().size());
-
-     RefPtr<StructureID> structureID = StructureID::addPropertyTransition(m_structureID, propertyName, value, attributes, this, slot, m_propertyStorage);
-     slot.setWasTransition(true);
-     setStructureID(structureID.release());
+    size_t currentCapacity = m_structureID->propertyStorageCapacity();
+    RefPtr<StructureID> structureID = StructureID::addPropertyTransition(m_structureID, propertyName, attributes, offset);
+    if (currentCapacity != structureID->propertyStorageCapacity())
+        allocatePropertyStorage(currentCapacity, structureID->propertyStorageCapacity());
+
+    ASSERT(offset < structureID->propertyStorageCapacity());
+    m_propertyStorage[offset] = value;
+    slot.setNewProperty(this, offset);
+    slot.setWasTransition(true);
+    setStructureID(structureID.release());
 }
 
 inline void JSObject::transitionTo(StructureID* newStructureID)
 {
-    StructureID::transitionTo(m_structureID, newStructureID, this);
+    if (m_structureID->propertyStorageCapacity() != newStructureID->propertyStorageCapacity())
+        allocatePropertyStorage(m_structureID->propertyStorageCapacity(), newStructureID->propertyStorageCapacity());
     setStructureID(newStructureID);
 }