Changeset 37645 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 16, 2008, 7:57:02 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Maciej Stachowiak.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21683
Don't create intermediate StructureIDs for builtin objects

First step in reduce number of StructureIDs created when initializing the
JSGlobalObject.

• In order to avoid creating the intermediate StructureIDs use the new putDirectWithoutTransition and putDirectFunctionWithoutTransition to add properties to JSObjects without transitioning the StructureID. This patch just implements this strategy for ObjectPrototype but alone reduces the number of StructureIDs create for about:blank by 10, from 142 to 132.

• kjs/JSGlobalObject.cpp: (JSC::JSGlobalObject::reset):
• kjs/JSObject.cpp: (JSC::JSObject::putDirectFunctionWithoutTransition):
• kjs/JSObject.h: (JSC::JSObject::putDirectWithoutTransition):
• kjs/ObjectPrototype.cpp: (JSC::ObjectPrototype::ObjectPrototype):
• kjs/ObjectPrototype.h:
• kjs/StructureID.cpp: (JSC::StructureID::addPropertyWithoutTransition):
• kjs/StructureID.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSGlobalObject.cpp (modified) (2 diffs)
• kjs/JSObject.cpp (modified) (1 diff)
• kjs/JSObject.h (modified) (2 diffs)
• kjs/ObjectPrototype.cpp (modified) (1 diff)
• kjs/ObjectPrototype.h (modified) (1 diff)
• kjs/StructureID.cpp (modified) (1 diff)
• kjs/StructureID.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-16  Sam Weinig  <[email protected]>
+
+        Reviewed by Maciej Stachowiak.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=21683
+        Don't create intermediate StructureIDs for builtin objects
+
+        First step in reduce number of StructureIDs created when initializing the
+        JSGlobalObject.
+
+        - In order to avoid creating the intermediate StructureIDs use the new putDirectWithoutTransition
+          and putDirectFunctionWithoutTransition to add properties to JSObjects without transitioning
+          the StructureID.  This patch just implements this strategy for ObjectPrototype but alone
+          reduces the number of StructureIDs create for about:blank by 10, from 142 to 132.
+
+        * kjs/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::reset):
+        * kjs/JSObject.cpp:
+        (JSC::JSObject::putDirectFunctionWithoutTransition):
+        * kjs/JSObject.h:
+        (JSC::JSObject::putDirectWithoutTransition):
+        * kjs/ObjectPrototype.cpp:
+        (JSC::ObjectPrototype::ObjectPrototype):
+        * kjs/ObjectPrototype.h:
+        * kjs/StructureID.cpp:
+        (JSC::StructureID::addPropertyWithoutTransition):
+        * kjs/StructureID.h:
+
 2008-10-16  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -206 +206 @@
     d()->prototypeFunctionStructure = PrototypeFunction::createStructureID(d()->functionPrototype);
     d()->functionPrototype->addFunctionProperties(exec, d()->prototypeFunctionStructure.get());
-    d()->objectPrototype = new (exec) ObjectPrototype(exec, d()->prototypeFunctionStructure.get());
+
+    d()->objectPrototype = new (exec) ObjectPrototype(exec, ObjectPrototype::createStructureID(jsNull()), d()->prototypeFunctionStructure.get());
     d()->emptyObjectStructure = d()->objectPrototype->inheritorID();
     d()->functionPrototype->setPrototype(d()->objectPrototype);
@@ -259 +260 @@
     d()->typeErrorConstructor = new (exec) NativeErrorConstructor(exec, nativeErrorStructure, typeErrorPrototype);
     d()->URIErrorConstructor = new (exec) NativeErrorConstructor(exec, nativeErrorStructure, URIErrorPrototype);
-    
+
     d()->functionPrototype->putDirect(exec->propertyNames().constructor, functionConstructor, DontEnum);
 
-    d()->objectPrototype->putDirect(exec->propertyNames().constructor, objectConstructor, DontEnum);
+    d()->objectPrototype->putDirectWithoutTransition(exec->propertyNames().constructor, objectConstructor, DontEnum);
+
     d()->functionPrototype->putDirect(exec->propertyNames().constructor, functionConstructor, DontEnum);
     d()->arrayPrototype->putDirect(exec->propertyNames().constructor, arrayConstructor, DontEnum);

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -491 +491 @@
 }
 
+void JSObject::putDirectFunctionWithoutTransition(ExecState* exec, InternalFunction* function, unsigned attr)
+{
+    putDirectWithoutTransition(Identifier(exec, function->name(&exec->globalData())), function, attr);
+}
+
 NEVER_INLINE void JSObject::fillGetterPropertySlot(PropertySlot& slot, JSValue** location)
 {

trunk/JavaScriptCore/kjs/JSObject.h

@@ -158 +158 @@
         void putDirect(const Identifier& propertyName, JSValue* value, unsigned attr, bool checkReadOnly, PutPropertySlot& slot);
         void putDirectFunction(ExecState* exec, InternalFunction* function, unsigned attr = 0);
+        void putDirectWithoutTransition(const Identifier& propertyName, JSValue* value, unsigned attr);
+        void putDirectFunctionWithoutTransition(ExecState* exec, InternalFunction* function, unsigned attr);
 
         // Fast access to known property offsets.
@@ -414 +416 @@
 }
 
+inline void JSObject::putDirectWithoutTransition(const Identifier& propertyName, JSValue* value, unsigned attributes)
+{
+    size_t currentCapacity = m_structureID->propertyStorageCapacity();
+    size_t offset = m_structureID->addPropertyWithoutTransition(propertyName, attributes);
+    if (currentCapacity != m_structureID->propertyStorageCapacity())
+        allocatePropertyStorage(currentCapacity, m_structureID->propertyStorageCapacity());
+    m_propertyStorage[offset] = value;
+}
+
 inline void JSObject::transitionTo(StructureID* newStructureID)
 {

trunk/JavaScriptCore/kjs/ObjectPrototype.cpp

@@ -40 +40 @@
 static JSValue* objectProtoFuncToLocaleString(ExecState*, JSObject*, JSValue*, const ArgList&);
 
-ObjectPrototype::ObjectPrototype(ExecState* exec, StructureID* prototypeFunctionStructure)
-    : JSObject(exec->globalData().nullProtoStructureID)
+ObjectPrototype::ObjectPrototype(ExecState* exec, PassRefPtr<StructureID> stucture, StructureID* prototypeFunctionStructure)
+    : JSObject(stucture)
 {
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().toString, objectProtoFuncToString), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().toLocaleString, objectProtoFuncToLocaleString), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().valueOf, objectProtoFuncValueOf), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().hasOwnProperty, objectProtoFuncHasOwnProperty), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().propertyIsEnumerable, objectProtoFuncPropertyIsEnumerable), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().isPrototypeOf, objectProtoFuncIsPrototypeOf), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().toString, objectProtoFuncToString), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().toLocaleString, objectProtoFuncToLocaleString), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 0, exec->propertyNames().valueOf, objectProtoFuncValueOf), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().hasOwnProperty, objectProtoFuncHasOwnProperty), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().propertyIsEnumerable, objectProtoFuncPropertyIsEnumerable), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().isPrototypeOf, objectProtoFuncIsPrototypeOf), DontEnum);
 
     // Mozilla extensions
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 2, exec->propertyNames().__defineGetter__, objectProtoFuncDefineGetter), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 2, exec->propertyNames().__defineSetter__, objectProtoFuncDefineSetter), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().__lookupGetter__, objectProtoFuncLookupGetter), DontEnum);
-    putDirectFunction(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().__lookupSetter__, objectProtoFuncLookupSetter), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 2, exec->propertyNames().__defineGetter__, objectProtoFuncDefineGetter), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 2, exec->propertyNames().__defineSetter__, objectProtoFuncDefineSetter), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().__lookupGetter__, objectProtoFuncLookupGetter), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().__lookupSetter__, objectProtoFuncLookupSetter), DontEnum);
 }
 

trunk/JavaScriptCore/kjs/ObjectPrototype.h

@@ -28 +28 @@
     class ObjectPrototype : public JSObject {
     public:
-        ObjectPrototype(ExecState*, StructureID* prototypeFunctionStructure);
+        ObjectPrototype(ExecState*, PassRefPtr<StructureID>, StructureID* prototypeFunctionStructure);
     };
 

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -318 +318 @@
 }
 
+size_t StructureID::addPropertyWithoutTransition(const Identifier& propertyName, unsigned attributes)
+{
+    size_t offset = m_propertyMap.put(propertyName, attributes);
+    if (m_propertyMap.storageSize() > propertyStorageCapacity())
+        growPropertyStorageCapacity();
+    return offset;
+}
+
 StructureIDChain* StructureID::createCachedPrototypeChain()
 {

trunk/JavaScriptCore/kjs/StructureID.h

@@ -106 +106 @@
         }
 
+        size_t addPropertyWithoutTransition(const Identifier& propertyName, unsigned attributes);
+
         bool isDictionary() const { return m_isDictionary; }