Changeset 96143 in webkit

Timestamp:

Sep 27, 2011 12:53:49 PM (13 years ago)

Author:

mhahnenberg@apple.com

Message:

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

Reviewed by Darin Adler.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:

Changed JSCell::getPrimitiveNumber to manually handle the dispatch for
JSCells (JSObject and JSString in this case).

• runtime/JSCell.cpp:

(JSC::JSCell::getPrimitiveNumber):

• runtime/JSCell.h:

Removed JSNotAnObject::getPrimitiveNumber since its return value doesn't
matter and it already implements defaultValue, so JSObject::getPrimitiveNumber
can cover the case for JSNotAnObject.

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

De-virtualized JSObject::getPrimitiveNumber and JSString::getPrimitiveNumber
and changed them to be const. Also made JSString::getPrimitiveNumber public
because it needs to be called from JSCell::getPrimitiveNumber and also since it's
no longer virtual, we want people who have a more specific pointer (JSString*
instead of JSCell*) to not have to pay the cost of a virtual method call.

• runtime/JSObject.cpp:

(JSC::JSObject::getPrimitiveNumber):

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

(JSC::JSString::getPrimitiveNumber):

• runtime/JSString.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (2 diffs)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• runtime/JSCell.cpp (modified) (1 diff)
• runtime/JSCell.h (modified) (1 diff)
• runtime/JSNotAnObject.cpp (modified) (1 diff)
• runtime/JSNotAnObject.h (modified) (1 diff)
• runtime/JSObject.cpp (modified) (1 diff)
• runtime/JSObject.h (modified) (1 diff)
• runtime/JSString.cpp (modified) (1 diff)
• runtime/JSString.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-27  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        De-virtualize JSCell::getPrimitiveNumber
+        https://bugs.webkit.org/show_bug.cgi?id=68851
+
+        Reviewed by Darin Adler.
+
+        * JavaScriptCore.exp:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+
+        Changed JSCell::getPrimitiveNumber to manually handle the dispatch for 
+        JSCells (JSObject and JSString in this case).
+        * runtime/JSCell.cpp:
+        (JSC::JSCell::getPrimitiveNumber):
+        * runtime/JSCell.h:
+
+        Removed JSNotAnObject::getPrimitiveNumber since its return value doesn't 
+        matter and it already implements defaultValue, so JSObject::getPrimitiveNumber
+        can cover the case for JSNotAnObject.
+        * runtime/JSNotAnObject.cpp:
+        * runtime/JSNotAnObject.h:
+
+        De-virtualized JSObject::getPrimitiveNumber and JSString::getPrimitiveNumber 
+        and changed them to be const.  Also made JSString::getPrimitiveNumber public 
+        because it needs to be called from JSCell::getPrimitiveNumber and also since it's 
+        no longer virtual, we want people who have a more specific pointer (JSString* 
+        instead of JSCell*) to not have to pay the cost of a virtual method call.
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::getPrimitiveNumber):
+        * runtime/JSObject.h:
+        * runtime/JSString.cpp:
+        (JSC::JSString::getPrimitiveNumber):
+        * runtime/JSString.h:
+
 2011-09-27  Juan Carlos Montemayor Elosua  <j.mont@me.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.exp

@@ -260 +260 @@
 __ZN3JSC6JSCell18getOwnPropertySlotEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
 __ZN3JSC6JSCell18getOwnPropertySlotEPNS_9ExecStateEjRNS_12PropertySlotE
-__ZN3JSC6JSCell18getPrimitiveNumberEPNS_9ExecStateERdRNS_7JSValueE
 __ZN3JSC6JSCell3putEPNS_9ExecStateERKNS_10IdentifierENS_7JSValueERNS_15PutPropertySlotE
 __ZN3JSC6JSCell3putEPNS_9ExecStateEjNS_7JSValueE  
@@ -323 +322 @@
 __ZN3JSC8JSObject17putWithAttributesEPNS_9ExecStateEjNS_7JSValueEj
 __ZN3JSC8JSObject18getOwnPropertySlotEPNS_9ExecStateEjRNS_12PropertySlotE
-__ZN3JSC8JSObject18getPrimitiveNumberEPNS_9ExecStateERdRNS_7JSValueE
 __ZN3JSC8JSObject19getOwnPropertyNamesEPNS_9ExecStateERNS_17PropertyNameArrayENS_15EnumerationModeE
 __ZN3JSC8JSObject20visitChildrenVirtualERNS_11SlotVisitorE

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

@@ -206 +206 @@
     ?getOwnPropertySlot@StringObject@JSC@@UAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertySlot@2@@Z
     ?getOwnPropertySlot@StringObject@JSC@@UAE_NPAVExecState@2@IAAVPropertySlot@2@@Z
-    ?getPrimitiveNumber@JSCell@JSC@@UAE_NPAVExecState@2@AANAAVJSValue@2@@Z
-    ?getPrimitiveNumber@JSObject@JSC@@UAE_NPAVExecState@2@AANAAVJSValue@2@@Z
-    ?getPrimitiveNumber@JSString@JSC@@EAE_NPAVExecState@2@AANAAVJSValue@2@@Z
     ?getPropertyDescriptor@JSObject@JSC@@QAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z
     ?getPropertyNames@JSObject@JSC@@UAEXPAVExecState@2@AAVPropertyNameArray@2@W4EnumerationMode@2@@Z

trunk/Source/JavaScriptCore/runtime/JSCell.cpp

@@ -128 +128 @@
 }
 
-bool JSCell::getPrimitiveNumber(ExecState*, double&, JSValue&)
+bool JSCell::getPrimitiveNumber(ExecState* exec, double& number, JSValue& value) const
 {
-    ASSERT_NOT_REACHED();
-    return false;
+    if (isString())
+        return static_cast<const JSString*>(this)->getPrimitiveNumber(exec, number, value);
+    return static_cast<const JSObject*>(this)->getPrimitiveNumber(exec, number, value);
 }
 

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -79 +79 @@
         // Basic conversions.
         JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
-        virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue&);
+        bool getPrimitiveNumber(ExecState*, double& number, JSValue&) const;
         bool toBoolean(ExecState*) const;
         virtual double toNumber(ExecState*) const;

trunk/Source/JavaScriptCore/runtime/JSNotAnObject.cpp

@@ -42 +42 @@
     ASSERT_UNUSED(exec, exec->hadException());
     return jsNumber(0);
-}
-
-bool JSNotAnObject::getPrimitiveNumber(ExecState* exec, double&, JSValue&)
-{
-    ASSERT_UNUSED(exec, exec->hadException());
-    return false;
 }
 

trunk/Source/JavaScriptCore/runtime/JSNotAnObject.h

@@ -65 +65 @@
         // JSValue methods
         virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
-        virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue&);
         virtual double toNumber(ExecState*) const;
         virtual UString toString(ExecState*) const;

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -289 +289 @@
 }
 
-bool JSObject::getPrimitiveNumber(ExecState* exec, double& number, JSValue& result)
+bool JSObject::getPrimitiveNumber(ExecState* exec, double& number, JSValue& result) const
 {
     result = defaultValue(exec, PreferNumber);

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -134 +134 @@
 
         JSValue toPrimitive(ExecState*, PreferredPrimitiveType = NoPreference) const;
-        virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue& value);
         bool toBoolean(ExecState*) const;
+        bool getPrimitiveNumber(ExecState*, double& number, JSValue&) const;
         virtual double toNumber(ExecState*) const;
         virtual UString toString(ExecState*) const;

trunk/Source/JavaScriptCore/runtime/JSString.cpp

@@ -275 +275 @@
 }
 
-bool JSString::getPrimitiveNumber(ExecState* exec, double& number, JSValue& result)
+bool JSString::getPrimitiveNumber(ExecState* exec, double& number, JSValue& result) const
 {
     result = this;

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -429 +429 @@
         JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
         bool toBoolean(ExecState*) const;
+        bool getPrimitiveNumber(ExecState*, double& number, JSValue&) const;
         
         bool getStringPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
@@ -496 +497 @@
         }
 
-        virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue& value);
         virtual double toNumber(ExecState*) const;
         virtual JSObject* toObject(ExecState*, JSGlobalObject*) const;