Changeset 36325 in webkit for trunk/JavaScriptCore/kjs/JSObject.cpp

Timestamp:

Sep 10, 2008, 7:42:18 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff Garen.

Add inline property storage for JSObject.

1.2% progression on Sunspider. .5% progression on the v8 test suite.

• JavaScriptCore.exp:
• VM/CTI.cpp: (JSC::CTI::privateCompileGetByIdProto): (JSC::CTI::privateCompileGetByIdChain):
• kjs/JSObject.cpp: (JSC::JSObject::mark): There is no reason to check storageSize now that we start from 0. (JSC::JSObject::allocatePropertyStorage): Allocates/reallocates heap storage.
• kjs/JSObject.h: (JSC::JSObject::offsetForLocation): m_propertyStorage is not an OwnArrayPtr now so there is no reason to .get() (JSC::JSObject::usingInlineStorage): (JSC::JSObject::JSObject): Start with m_propertyStorage pointing to the inline storage. (JSC::JSObject::~JSObject): Free the heap storage if not using the inline storage. (JSC::JSObject::putDirect): Switch to the heap storage only when we know we know that we are about to add a property that will overflow the inline storage.
• kjs/PropertyMap.cpp: (JSC::PropertyMap::createTable): Don't allocate the propertyStorage, that is now handled by JSObject. (JSC::PropertyMap::rehash): PropertyStorage is not a OwnArrayPtr anymore.
• kjs/PropertyMap.h: (JSC::PropertyMap::storageSize): Rename from markingCount.
• kjs/StructureID.cpp: (JSC::StructureID::addPropertyTransition): Don't resize the property storage if we are using inline storage.
• kjs/StructureID.h:

File:

• trunk/JavaScriptCore/kjs/JSObject.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -71 +71 @@
     m_structureID->mark();
 
-    unsigned storageSize = m_structureID->propertyMap().markingCount();
-    if (storageSize) {
-        for (unsigned i = 0; i < storageSize; ++i) {
-            JSValue* v = m_propertyStorage[i];
-            if (!v->marked())
-                v->mark();
-        }
+    unsigned storageSize = m_structureID->propertyMap().storageSize();
+    for (unsigned i = 0; i < storageSize; ++i) {
+        JSValue* v = m_propertyStorage[i];
+        if (!v->marked())
+            v->mark();
     }
 
@@ -529 +527 @@
 }
 
+void JSObject::allocatePropertyStorage(size_t oldSize, size_t newSize)
+{
+    JSValue** oldPropertStorage = m_propertyStorage;
+    m_propertyStorage = new JSValue*[newSize];
+
+    for (unsigned i = 0; i < oldSize; ++i)
+        m_propertyStorage[i] = oldPropertStorage[i];
+
+    if (oldPropertStorage != m_inlineStorage)
+        delete oldPropertStorage;
+}
+
 JSObject* constructEmptyObject(ExecState* exec)
 {