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

Timestamp:

Oct 31, 2011, 6:15:06 PM (14 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

Source/JavaScriptCore:

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

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• runtime/ClassInfo.h:
• runtime/ExceptionHelpers.cpp:

(JSC::InterruptedExecutionError::defaultValue):
(JSC::TerminatedExecutionError::defaultValue):

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

(JSC::JSCell::defaultValue):

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

(JSC::JSNotAnObject::defaultValue):

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

(JSC::JSObject::getPrimitiveNumber):
(JSC::JSObject::defaultValue):

• runtime/JSObject.h:

(JSC::JSObject::toPrimitive):

Source/WebCore:

No new tests.

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

• WebCore.exp.in:
• bridge/objc/objc_runtime.h:
• bridge/objc/objc_runtime.mm:

(JSC::Bindings::ObjcFallbackObjectImp::defaultValue):

• bridge/runtime_object.cpp:

(JSC::Bindings::RuntimeObject::defaultValue):

• bridge/runtime_object.h:

File:

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

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -309 +309 @@
 bool JSObject::getPrimitiveNumber(ExecState* exec, double& number, JSValue& result) const
 {
-    result = defaultValue(exec, PreferNumber);
+    result = methodTable()->defaultValue(this, exec, PreferNumber);
     number = result.toNumber(exec);
     return !result.isString();
@@ -315 +315 @@
 
 // ECMA 8.6.2.6
-JSValue JSObject::defaultValue(ExecState* exec, PreferredPrimitiveType hint) const
+JSValue JSObject::defaultValue(const JSObject* object, ExecState* exec, PreferredPrimitiveType hint)
 {
     // Must call toString first for Date objects.
-    if ((hint == PreferString) || (hint != PreferNumber && prototype() == exec->lexicalGlobalObject()->datePrototype())) {
-        JSValue value = callDefaultValueFunction(exec, this, exec->propertyNames().toString);
+    if ((hint == PreferString) || (hint != PreferNumber && object->prototype() == exec->lexicalGlobalObject()->datePrototype())) {
+        JSValue value = callDefaultValueFunction(exec, object, exec->propertyNames().toString);
         if (value)
             return value;
-        value = callDefaultValueFunction(exec, this, exec->propertyNames().valueOf);
+        value = callDefaultValueFunction(exec, object, exec->propertyNames().valueOf);
         if (value)
             return value;
     } else {
-        JSValue value = callDefaultValueFunction(exec, this, exec->propertyNames().valueOf);
+        JSValue value = callDefaultValueFunction(exec, object, exec->propertyNames().valueOf);
         if (value)
             return value;
-        value = callDefaultValueFunction(exec, this, exec->propertyNames().toString);
+        value = callDefaultValueFunction(exec, object, exec->propertyNames().toString);
         if (value)
             return value;