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

trunk/JavaScriptCore/VM/CTI.cpp

@@ -1738 +1738 @@
     // referencing the prototype object - let's speculatively load it's table nice and early!)
     JSObject* protoObject = static_cast<JSObject*>(structureID->prototypeForLookup(exec));
-    OwnArrayPtr<JSValue*>* protoPropertyStorage = &protoObject->m_propertyStorage;
+    PropertyStorage* protoPropertyStorage = &protoObject->m_propertyStorage;
     m_jit.movl_mr(static_cast<void*>(protoPropertyStorage), X86::edx);
 
@@ -1783 +1783 @@
     StructureID* currStructureID = structureID;
     RefPtr<StructureID>* chainEntries = chain->head();
-    JSCell* protoObject = 0;
+    JSObject* protoObject = 0;
     for (unsigned i = 0; i<count; ++i) {
-        protoObject = static_cast<JSCell*>(currStructureID->prototypeForLookup(exec));
+        protoObject = static_cast<JSObject*>(currStructureID->prototypeForLookup(exec));
         currStructureID = chainEntries[i].get();
 
@@ -1794 +1794 @@
     }
     ASSERT(protoObject);
- 
-    OwnArrayPtr<JSValue*>* protoPropertyStorage = &static_cast<JSObject*>(protoObject)->m_propertyStorage;
+
+    PropertyStorage* protoPropertyStorage = &protoObject->m_propertyStorage;
     m_jit.movl_mr(static_cast<void*>(protoPropertyStorage), X86::edx);
     m_jit.movl_mr(cachedOffset * sizeof(JSValue*), X86::edx, X86::eax);