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

trunk/JavaScriptCore/VM/CTI.cpp

@@ -2778 +2778 @@
 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;
@@ -2793 +2787 @@
 static inline bool transitionWillNeedStorageRealloc(StructureID* oldStructureID, StructureID* newStructureID)
 {
-    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;
+    return oldStructureID->propertyStorageCapacity() != newStructureID->propertyStorageCapacity();
 }