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

Timestamp:

Nov 1, 2011, 5:36:20 PM (14 years ago)

Author:

[email protected]

Message:

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

Reviewed by Darin Adler.

Source/JavaScriptCore:

Added defineSetter to the MethodTable, changed all the virtual
implementations of defineSetter to static ones, and replaced
all call sites with corresponding lookups in the MethodTable.

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

(JSC::DebuggerActivation::defineSetter):

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

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

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

(JSC::JSCell::defineSetter):

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

(JSC::JSGlobalObject::defineSetter):

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

(JSC::JSObject::defineSetter):
(JSC::putDescriptor):

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

(JSC::objectProtoFuncDefineSetter):

Source/WebCore:

No new tests.

Added defineSetter to the MethodTable, changed all the virtual
implementations of defineSetter to static ones, and replaced
all call sites with corresponding lookups in the MethodTable.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::defineSetter):

• bindings/js/JSDOMWindowShell.cpp:

(WebCore::JSDOMWindowShell::defineSetter):

• bindings/js/JSDOMWindowShell.h:
• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):

File:

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

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -403 +403 @@
 }
 
-void JSObject::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunction, unsigned attributes)
+void JSObject::defineSetter(JSObject* thisObject, ExecState* exec, const Identifier& propertyName, JSObject* setterFunction, unsigned attributes)
 {
     if (propertyName == exec->propertyNames().underscoreProto) {
@@ -410 +410 @@
     }
 
-    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)->setSetter(exec->globalData(), setterFunction);
         return;
@@ -419 +419 @@
     PutPropertySlot slot;
     GetterSetter* getterSetter = GetterSetter::create(exec);
-    putDirectInternal(exec->globalData(), propertyName, getterSetter, attributes | Setter, true, slot, 0);
+    thisObject->putDirectInternal(exec->globalData(), propertyName, getterSetter, attributes | Setter, true, slot, 0);
 
     // putDirect will change our Structure if we add a new property. For
@@ -425 +425 @@
     // if we override an existing non-getter or non-setter.
     if (slot.type() != PutPropertySlot::NewProperty) {
-        if (!structure()->isDictionary())
-            setStructure(exec->globalData(), Structure::getterSetterTransition(exec->globalData(), structure()));
-    }
-
-    structure()->setHasGetterSetterProperties(true);
+        if (!thisObject->structure()->isDictionary())
+            thisObject->setStructure(exec->globalData(), Structure::getterSetterTransition(exec->globalData(), thisObject->structure()));
+    }
+
+    thisObject->structure()->setHasGetterSetterProperties(true);
     getterSetter->setSetter(exec->globalData(), setterFunction);
 }
@@ -737 +737 @@
         return false;
     if (descriptor.setter() && descriptor.setter().isObject())
-        target->defineSetter(exec, propertyName, asObject(descriptor.setter()), attributes);
+        target->methodTable()->defineSetter(target, exec, propertyName, asObject(descriptor.setter()), attributes);
     return !exec->hadException();
 }