Changeset 98889 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

Oct 31, 2011, 3:24:20 PM (14 years ago)

Author:

[email protected]

Message:

De-virtualize JSObject::defineGetter
​https://bugs.webkit.org/show_bug.cgi?id=71134

Reviewed by Darin Adler.

Source/JavaScriptCore:

Added defineGetter to the MethodTable. Replaced all virtual versions of defineGetter
with static versions. Replaced all call sites with lookups in the MethodTable.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• debugger/DebuggerActivation.cpp:

(JSC::DebuggerActivation::defineGetter):

• debugger/DebuggerActivation.h:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/ClassInfo.h:
• runtime/JSCell.cpp:

(JSC::JSCell::defineGetter):

• runtime/JSCell.h:
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::defineGetter):

• runtime/JSGlobalObject.h:
• runtime/JSObject.cpp:

(JSC::JSObject::defineGetter):
(JSC::putDescriptor):

• runtime/JSObject.h:
• runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncDefineGetter):

Source/WebCore:

No new tests.

Added defineGetter to the MethodTable. Replaced all virtual versions of defineGetter
with static versions. Replaced all call sites with lookups in the MethodTable.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::defineGetter):

• bindings/js/JSDOMWindowShell.cpp:

(WebCore::JSDOMWindowShell::defineGetter):

• bindings/js/JSDOMWindowShell.h:
• bindings/js/JSLocationCustom.cpp:

(WebCore::JSLocation::defineGetter):
(WebCore::JSLocationPrototype::defineGetter):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):

Source/WebKit/qt:

Added defineGetter to the MethodTable. Replaced all virtual versions of defineGetter
with static versions. Replaced all call sites with lookups in the MethodTable.

• Api/qwebframe.cpp:

(QWebFramePrivate::addQtSenderToGlobalObject):

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -349 +349 @@
 }
 
-void JSObject::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes)
+void JSObject::defineGetter(JSObject* thisObject, ExecState* exec, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes)
 {
     if (propertyName == exec->propertyNames().underscoreProto) {
@@ -356 +356 @@
     }
 
-    JSValue object = getDirect(exec->globalData(), propertyName);
+    JSValue object = thisObject->getDirect(exec->globalData(), propertyName);
     if (object && object.isGetterSetter()) {
-        ASSERT(structure()->hasGetterSetterProperties());
+        ASSERT(thisObject->structure()->hasGetterSetterProperties());
         asGetterSetter(object)->setGetter(exec->globalData(), getterFunction);
         return;
@@ -366 +366 @@
     PutPropertySlot slot;
     GetterSetter* getterSetter = GetterSetter::create(exec);
-    putDirectInternal(globalData, propertyName, getterSetter, attributes | Getter, true, slot, 0);
+    thisObject->putDirectInternal(globalData, propertyName, getterSetter, attributes | Getter, true, slot, 0);
 
     // putDirect will change our Structure if we add a new property. For
@@ -372 +372 @@
     // if we override an existing non-getter or non-setter.
     if (slot.type() != PutPropertySlot::NewProperty) {
-        if (!structure()->isDictionary())
-            setStructure(exec->globalData(), Structure::getterSetterTransition(globalData, structure()));
-    }
-
-    structure()->setHasGetterSetterProperties(true);
+        if (!thisObject->structure()->isDictionary())
+            thisObject->setStructure(exec->globalData(), Structure::getterSetterTransition(globalData, thisObject->structure()));
+    }
+
+    thisObject->structure()->setHasGetterSetterProperties(true);
     getterSetter->setGetter(globalData, getterFunction);
 }
@@ -730 +730 @@
     attributes &= ~ReadOnly;
     if (descriptor.getter() && descriptor.getter().isObject())
-        target->defineGetter(exec, propertyName, asObject(descriptor.getter()), attributes);
+        target->methodTable()->defineGetter(target, exec, propertyName, asObject(descriptor.getter()), attributes);
     if (exec->hadException())
         return false;