Changeset 95893 in webkit

Timestamp:

Sep 23, 2011 6:19:56 PM (13 years ago)

Author:

mhahnenberg@apple.com

Message:

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

Reviewed by Oliver Hunt.

Added a new JSType to check whether or not something is a
NumberObject (which includes NumberPrototype) in TypeInfo::isNumberObject because there's not
currently a better way to determine whether something is indeed a NumberObject.
Also de-virtualized JSCell::getJSNumber, having it check the TypeInfo
for whether the object is a NumberObject or not. This patch is part of
the larger process of de-virtualizing JSCell.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• runtime/JSCell.cpp:

(JSC::JSCell::getJSNumber):

• runtime/JSCell.h:

(JSC::JSValue::getJSNumber):

• runtime/JSType.h:
• runtime/JSTypeInfo.h:

(JSC::TypeInfo::isNumberObject):

• runtime/JSValue.h:
• runtime/NumberObject.cpp:

(JSC::NumberObject::getJSNumber):

• runtime/NumberObject.h:

(JSC::NumberObject::createStructure):

• runtime/NumberPrototype.h:

(JSC::NumberPrototype::createStructure):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• runtime/JSCell.cpp (modified) (2 diffs)
• runtime/JSCell.h (modified) (2 diffs)
• runtime/JSType.h (modified) (1 diff)
• runtime/JSTypeInfo.h (modified) (1 diff)
• runtime/JSValue.h (modified) (1 diff)
• runtime/NumberObject.cpp (modified) (1 diff)
• runtime/NumberObject.h (modified) (1 diff)
• runtime/NumberPrototype.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-23  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        De-virtualize JSCell::getJSNumber
+        https://bugs.webkit.org/show_bug.cgi?id=68651
+
+        Reviewed by Oliver Hunt.
+
+        Added a new JSType to check whether or not something is a 
+        NumberObject (which includes NumberPrototype) in TypeInfo::isNumberObject because there's not 
+        currently a better way to determine whether something is indeed a NumberObject.
+        Also de-virtualized JSCell::getJSNumber, having it check the TypeInfo 
+        for whether the object is a NumberObject or not.  This patch is part of 
+        the larger process of de-virtualizing JSCell.
+
+        * JavaScriptCore.exp:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        * runtime/JSCell.cpp:
+        (JSC::JSCell::getJSNumber):
+        * runtime/JSCell.h:
+        (JSC::JSValue::getJSNumber):
+        * runtime/JSType.h:
+        * runtime/JSTypeInfo.h:
+        (JSC::TypeInfo::isNumberObject):
+        * runtime/JSValue.h:
+        * runtime/NumberObject.cpp:
+        (JSC::NumberObject::getJSNumber):
+        * runtime/NumberObject.h:
+        (JSC::NumberObject::createStructure):
+        * runtime/NumberPrototype.h:
+        (JSC::NumberPrototype::createStructure):
+
 2011-09-23  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.exp

@@ -254 +254 @@
 __ZN3JSC4callEPNS_9ExecStateENS_7JSValueENS_8CallTypeERKNS_8CallDataES2_RKNS_7ArgListE
 __ZN3JSC6JSCell11getCallDataERNS_8CallDataE
-__ZN3JSC6JSCell11getJSNumberEv
 __ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
 __ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateEj

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

@@ -189 +189 @@
     ?getCallData@JSCell@JSC@@UAE?AW4CallType@2@AATCallData@2@@Z
     ?getConstructData@JSCell@JSC@@UAE?AW4ConstructType@2@AATConstructData@2@@Z
-    ?getJSNumber@JSCell@JSC@@UAE?AVJSValue@2@XZ
     ?getObject@JSCell@JSC@@QAEPAVJSObject@2@XZ
     ?getOwnPropertyDescriptor@JSGlobalObject@JSC@@UAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z

trunk/Source/JavaScriptCore/runtime/JSCell.cpp

@@ -27 +27 @@
 #include "JSString.h"
 #include "JSObject.h"
+#include "NumberObject.h"
 #include <wtf/MathExtras.h>
 
@@ -113 +114 @@
 }
 
-JSValue JSCell::getJSNumber()
+JSValue JSCell::getJSNumber() const
 {
+    if (structure()->typeInfo().isNumberObject())
+        return static_cast<const NumberObject*>(this)->getJSNumber();
     return JSValue();
 }

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -96 +96 @@
 
         virtual JSObject* toThisObject(ExecState*) const;
-        virtual JSValue getJSNumber();
+        JSValue getJSNumber() const;
         void* vptr() { return *reinterpret_cast<void**>(this); }
         void setVPtr(void* vptr) { *reinterpret_cast<void**>(this) = vptr; }
@@ -315 +315 @@
     }
 
-    inline JSValue JSValue::getJSNumber()
+    inline JSValue JSValue::getJSNumber() const
     {
         if (isInt32() || isDouble())

trunk/Source/JavaScriptCore/runtime/JSType.h

@@ -42 +42 @@
     FinalObjectType     = 11,
     JSFunctionType      = 12,
+    NumberObjectType    = 13,
 };
 

trunk/Source/JavaScriptCore/runtime/JSTypeInfo.h

@@ -65 +65 @@
         bool isObject() const { return type() >= ObjectType; }
         bool isFinalObject() const { return type() == FinalObjectType; }
+        bool isNumberObject() const { return type() == NumberObjectType; }
 
         bool masqueradesAsUndefined() const { return isSetOnFlags1(MasqueradesAsUndefined); }

trunk/Source/JavaScriptCore/runtime/JSValue.h

@@ -216 +216 @@
         static bool strictEqualSlowCaseInline(ExecState* exec, JSValue v1, JSValue v2);
 
-        JSValue getJSNumber(); // JSValue() if this is not a JSNumber or number object
+        JSValue getJSNumber() const; // JSValue() if this is not a JSNumber or number object
 
         bool isCell() const;

trunk/Source/JavaScriptCore/runtime/NumberObject.cpp

@@ -43 +43 @@
 }
 
-JSValue NumberObject::getJSNumber()
+JSValue NumberObject::getJSNumber() const
 {
     return internalValue();

trunk/Source/JavaScriptCore/runtime/NumberObject.h

@@ -45 +45 @@
         static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype)
         {
-            return Structure::create(globalData, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info);
+            return Structure::create(globalData, globalObject, prototype, TypeInfo(NumberObjectType, StructureFlags), &s_info);
         }
 
-    private:
-        virtual JSValue getJSNumber();
+        JSValue getJSNumber() const;
     };
 

trunk/Source/JavaScriptCore/runtime/NumberPrototype.h

@@ -41 +41 @@
         static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype)
         {
-            return Structure::create(globalData, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info);
+            return Structure::create(globalData, globalObject, prototype, TypeInfo(NumberObjectType, StructureFlags), &s_info);
         }