Changeset 97292 in webkit

Timestamp:

Oct 12, 2011 1:23:08 PM (13 years ago)

Author:

mhahnenberg@apple.com

Message:

De-virtualize JSCell::toString
​https://bugs.webkit.org/show_bug.cgi?id=69677

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Removed toString from JSCallbackObject, since it is no
longer necessary since we now implicitly add toString and valueOf
functions to object prototypes when a convertToType callback
is provided, which is now the standard way to override toString
and valueOf in the JSC C API.

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:

Removed toString from InterruptedExecutionError and
TerminatedExecutionError and replaced it with defaultValue,
which JSObject::toString calls. We'll probably have to de-virtualize
defaultValue eventually, but we'll cross that bridge when we
come to it.

• runtime/ExceptionHelpers.cpp:

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

• runtime/ExceptionHelpers.h:

Removed toString from JSNotAnObject, since its return value doesn't
actually matter and JSObject::toString can cover it.

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

De-virtualized JSCell::toString, JSObject::toString and JSString::toString.
Added handling of all cases for JSCell to JSCell::toString.

• runtime/JSObject.h:
• runtime/JSString.h:
• runtime/JSCell.cpp:

(JSC::JSCell::toString):

• runtime/JSCell.h:

Source/JavaScriptGlue:

Removed UserObjectImp::toString because it's no longer necessary since
clients can provide their own toString callback which will in turn be
called by JSObject::toString.

• UserObjectImp.cpp:
• UserObjectImp.h:

Location:

trunk/Source

Files:

• JavaScriptCore/API/JSCallbackObject.h (modified) (1 diff)
• JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• JavaScriptCore/runtime/ExceptionHelpers.cpp (modified) (2 diffs)
• JavaScriptCore/runtime/ExceptionHelpers.h (modified) (2 diffs)
• JavaScriptCore/runtime/JSCell.cpp (modified) (1 diff)
• JavaScriptCore/runtime/JSCell.h (modified) (1 diff)
• JavaScriptCore/runtime/JSNotAnObject.cpp (modified) (1 diff)
• JavaScriptCore/runtime/JSNotAnObject.h (modified) (1 diff)
• JavaScriptCore/runtime/JSObject.h (modified) (1 diff)
• JavaScriptCore/runtime/JSString.h (modified) (2 diffs)
• JavaScriptGlue/ChangeLog (modified) (1 diff)
• JavaScriptGlue/UserObjectImp.cpp (modified) (1 diff)
• JavaScriptGlue/UserObjectImp.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSCallbackObject.h

@@ -195 +195 @@
 
     virtual double toNumber(ExecState*) const;
-    virtual UString toString(ExecState*) const;
 
     virtual ConstructType getConstructData(ConstructData&);

trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -515 +515 @@
 
 template <class Parent>
-UString JSCallbackObject<Parent>::toString(ExecState* exec) const
-{
-    JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
-    
-    for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
-            JSValueRef exception = 0;
-            JSValueRef value;
-            {
-                APICallbackShim callbackShim(exec);
-                value = convertToType(ctx, thisRef, kJSTypeString, &exception);
-            }
-            if (exception) {
-                throwError(exec, toJS(exec, exception));
-                return "";
-            }
-            if (value)
-                return toJS(exec, value).getString(exec);
-        }
-            
-    return Parent::toString(exec);
-}
-
-template <class Parent>
 void JSCallbackObject<Parent>::setPrivate(void* data)
 {

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-10-12  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        De-virtualize JSCell::toString
+        https://bugs.webkit.org/show_bug.cgi?id=69677
+
+        Reviewed by Sam Weinig.
+
+        Removed toString from JSCallbackObject, since it is no 
+        longer necessary since we now implicitly add toString and valueOf
+        functions to object prototypes when a convertToType callback 
+        is provided, which is now the standard way to override toString 
+        and valueOf in the JSC C API.
+        * API/JSCallbackObject.h:
+        * API/JSCallbackObjectFunctions.h:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+
+        Removed toString from InterruptedExecutionError and 
+        TerminatedExecutionError and replaced it with defaultValue,
+        which JSObject::toString calls.  We'll probably have to de-virtualize 
+        defaultValue eventually, but we'll cross that bridge when we 
+        come to it.
+        * runtime/ExceptionHelpers.cpp:
+        (JSC::InterruptedExecutionError::defaultValue):
+        (JSC::TerminatedExecutionError::defaultValue):
+        * runtime/ExceptionHelpers.h:
+
+        Removed toString from JSNotAnObject, since its return value doesn't
+        actually matter and JSObject::toString can cover it.
+        * runtime/JSNotAnObject.cpp:
+        * runtime/JSNotAnObject.h:
+
+        De-virtualized JSCell::toString, JSObject::toString and JSString::toString.
+        Added handling of all cases for JSCell to JSCell::toString.
+        * runtime/JSObject.h:
+        * runtime/JSString.h:
+        * runtime/JSCell.cpp:
+        (JSC::JSCell::toString):
+        * runtime/JSCell.h:
+
 2011-10-12  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -353 +353 @@
     ?toObject@JSCell@JSC@@QBEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
     ?toObjectSlowCase@JSValue@JSC@@ABEPAVJSObject@2@PAVExecState@2@PAVJSGlobalObject@2@@Z
-    ?toString@JSCell@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
-    ?toString@JSObject@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
-    ?toString@JSString@JSC@@EBE?AVUString@2@PAVExecState@2@@Z
+    ?toString@JSCell@JSC@@QBE?AVUString@2@PAVExecState@2@@Z
+    ?toString@JSObject@JSC@@QBE?AVUString@2@PAVExecState@2@@Z
     ?toStringDecimal@DecimalNumber@WTF@@QBEIPA_WI@Z
     ?toStringExponential@DecimalNumber@WTF@@QBEIPA_WI@Z

trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -44 +44 @@
 const ClassInfo InterruptedExecutionError::s_info = { "InterruptedExecutionError", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(InterruptedExecutionError) };
 
-UString InterruptedExecutionError::toString(ExecState*) const
+JSValue InterruptedExecutionError::defaultValue(ExecState* exec, PreferredPrimitiveType hint) const
 {
-    return "JavaScript execution exceeded timeout.";
+    if (hint == PreferString)
+        return jsNontrivialString(exec, "JavaScript execution exceeded timeout.");
+    return JSValue(std::numeric_limits<double>::quiet_NaN());
 }
 
@@ -67 +69 @@
 const ClassInfo TerminatedExecutionError::s_info = { "TerminatedExecutionError", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(TerminatedExecutionError) };
 
-UString TerminatedExecutionError::toString(ExecState*) const
+JSValue TerminatedExecutionError::defaultValue(ExecState* exec, PreferredPrimitiveType hint) const
 {
-    return "JavaScript execution terminated.";
+    if (hint == PreferString)
+        return jsNontrivialString(exec, "JavaScript execution terminated.");
+    return JSValue(std::numeric_limits<double>::quiet_NaN());
 }
 

trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h

@@ -63 +63 @@
     }
 
-    virtual UString toString(ExecState*) const;
+    virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
 
 public:
@@ -90 +90 @@
     }
 
-    virtual UString toString(ExecState*) const;
+    virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
 
 public:

trunk/Source/JavaScriptCore/runtime/JSCell.cpp

@@ -169 +169 @@
 }
 
-UString JSCell::toString(ExecState*) const
+UString JSCell::toString(ExecState* exec) const
 {
-    ASSERT_NOT_REACHED();
-    return UString();
+    if (isString())
+        return static_cast<const JSString*>(this)->toString(exec);
+    return static_cast<const JSObject*>(this)->toString(exec);
 }
 

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -83 +83 @@
         bool toBoolean(ExecState*) const;
         virtual double toNumber(ExecState*) const;
-        virtual UString toString(ExecState*) const;
+        UString toString(ExecState*) const;
         JSObject* toObject(ExecState*, JSGlobalObject*) const;
 

trunk/Source/JavaScriptCore/runtime/JSNotAnObject.cpp

@@ -50 +50 @@
     ASSERT_UNUSED(exec, exec->hadException());
     return std::numeric_limits<double>::quiet_NaN();
-}
-
-UString JSNotAnObject::toString(ExecState* exec) const
-{
-    ASSERT_UNUSED(exec, exec->hadException());
-    return "";
 }
 

trunk/Source/JavaScriptCore/runtime/JSNotAnObject.h

@@ -68 +68 @@
         virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
         virtual double toNumber(ExecState*) const;
-        virtual UString toString(ExecState*) const;
 
         // JSObject methods

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -142 +142 @@
         bool getPrimitiveNumber(ExecState*, double& number, JSValue&) const;
         virtual double toNumber(ExecState*) const;
-        virtual UString toString(ExecState*) const;
+        UString toString(ExecState*) const;
 
         virtual JSObject* toThisObject(ExecState*) const;

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -431 +431 @@
         bool getPrimitiveNumber(ExecState*, double& number, JSValue&) const;
         JSObject* toObject(ExecState*, JSGlobalObject*) const;
+        UString toString(ExecState*) const;
         
         bool getStringPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
@@ -503 +504 @@
 
         virtual double toNumber(ExecState*) const;
-        virtual UString toString(ExecState*) const;
 
         virtual JSObject* toThisObject(ExecState*) const;

trunk/Source/JavaScriptGlue/ChangeLog

@@ +1 @@
+2011-10-12  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        De-virtualize JSCell::toString
+        https://bugs.webkit.org/show_bug.cgi?id=69677
+
+        Reviewed by Sam Weinig.
+
+        Removed UserObjectImp::toString because it's no longer necessary since 
+        clients can provide their own toString callback which will in turn be 
+        called by JSObject::toString.
+        * UserObjectImp.cpp:
+        * UserObjectImp.h:
+
 2011-10-10  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptGlue/UserObjectImp.cpp

@@ -329 +329 @@
 }
 
-UString UserObjectImp::toString(ExecState *exec) const
-{
-    UString result;
-    JSUserObject* jsObjPtr = KJSValueToJSObject(toObject(exec, exec->lexicalGlobalObject()), exec);
-    CFTypeRef cfValue = jsObjPtr ? jsObjPtr->CopyCFValue() : 0;
-    if (cfValue)
-    {
-        CFTypeID cfType = CFGetTypeID(cfValue);
-        if (cfValue == GetCFNull())
-        {
-            //
-        }
-        else if (cfType == CFBooleanGetTypeID())
-        {
-            if (cfValue == kCFBooleanTrue)
-            {
-                result = "true";
-            }
-            else
-            {
-                result = "false";
-            }
-        }
-        else if (cfType == CFStringGetTypeID())
-        {
-            result = CFStringToUString((CFStringRef)cfValue);
-        }
-        else if (cfType == CFNumberGetTypeID())
-        {
-            if (cfValue == kCFNumberNaN)
-            {
-                result = "Nan";
-            }
-            else if (CFNumberCompare(kCFNumberPositiveInfinity, (CFNumberRef)cfValue, 0) == 0)
-            {
-                result = "Infinity";
-            }
-            else if (CFNumberCompare(kCFNumberNegativeInfinity, (CFNumberRef)cfValue, 0) == 0)
-            {
-                result = "-Infinity";
-            }
-            else
-            {
-                CFStringRef cfNumStr;
-                double d = 0;
-                CFNumberGetValue((CFNumberRef)cfValue, kCFNumberDoubleType, &d);
-                if (CFNumberIsFloatType((CFNumberRef)cfValue))
-                {
-                    cfNumStr = CFStringCreateWithFormat(0, 0, CFSTR("%f"), d);
-                }
-                else
-                {
-                    cfNumStr = CFStringCreateWithFormat(0, 0, CFSTR("%.0f"), d);
-                }
-                result = CFStringToUString(cfNumStr);
-                ReleaseCFType(cfNumStr);
-            }
-        }
-        else if (cfType == CFArrayGetTypeID())
-        {
-            //
-        }
-        else if (cfType == CFDictionaryGetTypeID())
-        {
-            //
-        }
-        else if (cfType == CFSetGetTypeID())
-        {
-            //
-        }
-        else if (cfType == CFURLGetTypeID())
-        {
-            CFURLRef absURL = CFURLCopyAbsoluteURL((CFURLRef)cfValue);
-            if (absURL)
-            {
-                CFStringRef cfStr = CFURLGetString(absURL);
-                if (cfStr)
-                {
-                    result = CFStringToUString(cfStr);
-                }
-                ReleaseCFType(absURL);
-            }
-        }
-    }
-    ReleaseCFType(cfValue);
-    if (jsObjPtr) jsObjPtr->Release();
-    return result;
-}
-
 void UserObjectImp::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {

trunk/Source/JavaScriptGlue/UserObjectImp.h

@@ -63 +63 @@
     virtual bool toBoolean(ExecState *exec) const;
     virtual double toNumber(ExecState *exec) const;
-    virtual UString toString(ExecState *exec) const;
 
     static void visitChildren(JSCell*, SlotVisitor&);