Changeset 36325 in webkit for trunk/JavaScriptCore/kjs/PropertyMap.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/PropertyMap.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/PropertyMap.cpp

@@ -429 +429 @@
     m_table->sizeMask = newTableSize - 1;
 
-    propertyStorage.set(new JSValue*[m_table->size]);
-
     checkConsistency(propertyStorage);
 }
@@ -441 +439 @@
 
     Table* oldTable = m_table;
-    JSValue** oldPropertStorage = propertyStorage.release();
+    JSValue** oldPropertStorage = propertyStorage;
 
     m_table = static_cast<Table*>(fastZeroedMalloc(Table::allocationSize(newTableSize)));
@@ -447 +445 @@
     m_table->sizeMask = newTableSize - 1;
 
-    propertyStorage.set(new JSValue*[m_table->size]);
+    propertyStorage = new JSValue*[m_table->size];
 
     unsigned lastIndexUsed = 0;
@@ -461 +459 @@
     fastFree(oldTable);
     delete [] oldPropertStorage;
-
-    checkConsistency(propertyStorage);
-}
-
-void PropertyMap::resizePropertyStorage(PropertyStorage& propertyStorage, unsigned oldSize)
-{
-    ASSERT(m_table);
-
-    if (propertyStorage) {
-        JSValue** oldPropertStorage = propertyStorage.release();
-        propertyStorage.set(new JSValue*[m_table->size]);
-
-        // FIXME: this can probalby use memcpy 
-        for (unsigned i = 0; i < oldSize; ++i)
-            propertyStorage[i] = oldPropertStorage[i];
-
-        delete [] oldPropertStorage;
-    } else
-        propertyStorage.set(new JSValue*[m_table->size]);
 
     checkConsistency(propertyStorage);