Changeset 156621 in webkit

Timestamp:

Sep 29, 2013 5:57:07 PM (11 years ago)

Author:

akling@apple.com

Message:

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

Reviewed by Geoffrey Garen.

ArrayPrototype doesn't need the global object for anything during
construction, so reduce the amount of loads by just passing the VM.

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-09-29  Andreas Kling  <akling@apple.com>
+
+        Pass VM instead of JSGlobalObject to ArrayPrototype constructor.
+        <https://webkit.org/b/122079>
+
+        Reviewed by Geoffrey Garen.
+
+        ArrayPrototype doesn't need the global object for anything during
+        construction, so reduce the amount of loads by just passing the VM.
+
 2013-09-29  Andreas Kling  <akling@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp

@@ -116 +116 @@
 */
 
-ArrayPrototype* ArrayPrototype::create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure)
-{
-    ArrayPrototype* prototype = new (NotNull, allocateCell<ArrayPrototype>(*exec->heap())) ArrayPrototype(globalObject, structure);
-    prototype->finishCreation(globalObject);
+ArrayPrototype* ArrayPrototype::create(VM& vm, Structure* structure)
+{
+    ArrayPrototype* prototype = new (NotNull, allocateCell<ArrayPrototype>(vm.heap)) ArrayPrototype(vm, structure);
+    prototype->finishCreation(vm);
     return prototype;
 }
 
 // ECMA 15.4.4
-ArrayPrototype::ArrayPrototype(JSGlobalObject* globalObject, Structure* structure)
-    : JSArray(globalObject->vm(), structure, 0)
-{
-}
-
-void ArrayPrototype::finishCreation(JSGlobalObject* globalObject)
-{
-    VM& vm = globalObject->vm();
+ArrayPrototype::ArrayPrototype(VM& vm, Structure* structure)
+    : JSArray(vm, structure, 0)
+{
+}
+
+void ArrayPrototype::finishCreation(VM& vm)
+{
     Base::finishCreation(vm);
     ASSERT(inherits(info()));

trunk/Source/JavaScriptCore/runtime/ArrayPrototype.h

@@ -29 +29 @@
 class ArrayPrototype : public JSArray {
 private:
-    ArrayPrototype(JSGlobalObject*, Structure*);
+    ArrayPrototype(VM&, Structure*);
 
 public:
     typedef JSArray Base;
 
-    static ArrayPrototype* create(ExecState*, JSGlobalObject*, Structure*);
+    static ArrayPrototype* create(VM&, Structure*);
         
     static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
@@ -46 +46 @@
 
 protected:
-    void finishCreation(JSGlobalObject*);
+    void finishCreation(VM&);
 };
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -284 +284 @@
 #endif
 
-    m_arrayPrototype.set(vm, this, ArrayPrototype::create(exec, this, ArrayPrototype::createStructure(vm, this, m_objectPrototype.get())));
+    m_arrayPrototype.set(vm, this, ArrayPrototype::create(vm, ArrayPrototype::createStructure(vm, this, m_objectPrototype.get())));
     
     m_originalArrayStructureForIndexingShape[UndecidedShape >> IndexingShapeShift].set(vm, this, JSArray::createStructure(vm, this, m_arrayPrototype.get(), ArrayWithUndecided));