Changeset 157614 in webkit

Timestamp:

Oct 17, 2013, 4:35:47 PM (13 years ago)

Author:

akling@apple.com

Message:

Pass VM instead of JSGlobalObject to JSONObject constructor.
<​https://webkit.org/b/122999>

JSONObject was only use the JSGlobalObject to grab at the VM.
Dodge a few loads by passing the VM directly instead.

Reviewed by Geoffrey Garen.

• runtime/JSONObject.cpp:

(JSC::JSONObject::JSONObject):
(JSC::JSONObject::finishCreation):

• runtime/JSONObject.h:

(JSC::JSONObject::create):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (1 diff)
• runtime/JSONObject.cpp (modified) (1 diff)
• runtime/JSONObject.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-10-17  Andreas Kling  <akling@apple.com>
+
+        Pass VM instead of JSGlobalObject to JSONObject constructor.
+        <https://webkit.org/b/122999>
+
+        JSONObject was only use the JSGlobalObject to grab at the VM.
+        Dodge a few loads by passing the VM directly instead.
+
+        Reviewed by Geoffrey Garen.
+
+        * runtime/JSONObject.cpp:
+        (JSC::JSONObject::JSONObject):
+        (JSC::JSONObject::finishCreation):
+        * runtime/JSONObject.h:
+        (JSC::JSONObject::create):
+
 2013-10-17  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -396 +396 @@
     putDirectWithoutTransition(vm, vm.propertyNames->eval, m_evalFunction.get(), DontEnum);
 
-    putDirectWithoutTransition(vm, vm.propertyNames->JSON, JSONObject::create(exec, this, JSONObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
+    putDirectWithoutTransition(vm, vm.propertyNames->JSON, JSONObject::create(vm, JSONObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
     putDirectWithoutTransition(vm, vm.propertyNames->Math, MathObject::create(vm, this, MathObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
     

trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

@@ -55 +55 @@
 namespace JSC {
 
-JSONObject::JSONObject(JSGlobalObject* globalObject, Structure* structure)
-    : JSNonFinalObject(globalObject->vm(), structure)
-{
-}
-
-void JSONObject::finishCreation(JSGlobalObject* globalObject)
-{
-    Base::finishCreation(globalObject->vm());
+JSONObject::JSONObject(VM& vm, Structure* structure)
+    : JSNonFinalObject(vm, structure)
+{
+}
+
+void JSONObject::finishCreation(VM& vm)
+{
+    Base::finishCreation(vm);
     ASSERT(inherits(info()));
 }

trunk/Source/JavaScriptCore/runtime/JSONObject.h

@@ -37 +37 @@
         typedef JSNonFinalObject Base;
 
-        static JSONObject* create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure)
+        static JSONObject* create(VM& vm, Structure* structure)
         {
-            JSONObject* object = new (NotNull, allocateCell<JSONObject>(*exec->heap())) JSONObject(globalObject, structure);
-            object->finishCreation(globalObject);
+            JSONObject* object = new (NotNull, allocateCell<JSONObject>(vm.heap)) JSONObject(vm, structure);
+            object->finishCreation(vm);
             return object;
         }
@@ -52 +52 @@
 
     protected:
-        void finishCreation(JSGlobalObject*);
+        void finishCreation(VM&);
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | JSObject::StructureFlags;
 
     private:
-        JSONObject(JSGlobalObject*, Structure*);
+        JSONObject(VM&, Structure*);
         static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);