Changeset 37381 in webkit for trunk/JavaScriptCore/VM/CTI.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/VM/CTI.cpp (modified) (2 diffs)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -2744 +2744 @@
 static JSValue* SFX_CALL transitionObject(StructureID* newStructureID, size_t cachedOffset, JSObject* baseObject, JSValue* value)
 {
+    StructureID* oldStructureID = newStructureID->previousID();
+
     baseObject->transitionTo(newStructureID);
+
+    if (oldStructureID->propertyMap().storageSize() == JSObject::inlineStorageCapacity)
+        baseObject->allocatePropertyStorage(oldStructureID->propertyMap().storageSize(), oldStructureID->propertyMap().size());
+
     baseObject->putDirectOffset(cachedOffset, value);
     return baseObject;
@@ -2753 +2759 @@
 static inline bool transitionWillNeedStorageRealloc(StructureID* oldStructureID, StructureID* newStructureID)
 {
-    return oldStructureID->propertyStorageCapacity() != newStructureID->propertyStorageCapacity();
+    if (oldStructureID->propertyMap().storageSize() == JSObject::inlineStorageCapacity)
+        return true;
+
+    if (oldStructureID->propertyMap().storageSize() < JSObject::inlineStorageCapacity)
+        return false;
+
+    if (oldStructureID->propertyMap().size() != newStructureID->propertyMap().size())
+        return true;
+
+    return false;
 }