Changeset 95466 in webkit for trunk/Source/JavaScriptCore/runtime/JSString.h

Timestamp:

Sep 19, 2011, 1:32:52 PM (14 years ago)

Author:

[email protected]

Message:

Remove toPrimitive from JSCell
​https://bugs.webkit.org/show_bug.cgi?id=67875

Reviewed by Geoffrey Garen.

Part of the refactoring process to un-virtualize JSCell. We move
all of the implicit functionality provided by the virtual toPrimitive method
in JSCell to be explicit in JSValue::toPrimitive and JSCell:toPrimitive while
also de-virtualizing JSCell::toPrimitive.

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

(JSC::JSCell::toPrimitive):

• runtime/JSCell.h:

We replace JSNotAnObject::toPrimitive with defaultValue, which it overrides from
JSObject. This pushes the virtual method further down, enabling us to get rid
of the virtual call in JSCell. Eventually we'll probably have to deal with this
again, but we'll cross that bridge when we come to it.

• runtime/JSNotAnObject.cpp:

(JSC::JSNotAnObject::defaultValue):

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

(JSC::JSValue::toPrimitive):

File:

• trunk/Source/JavaScriptCore/runtime/JSString.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -427 +427 @@
         unsigned length() { return m_length; }
 
+        JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
         bool getStringPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
         bool getStringPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
@@ -493 +494 @@
         }
 
-        virtual JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue& value);
         virtual bool toBoolean(ExecState*) const;
@@ -682 +682 @@
 
     // --- JSValue inlines ----------------------------
+
+    inline JSValue JSValue::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
+    {
+        if (!isCell())
+            return asValue();
+        return asCell()->toPrimitive(exec, preferredType);
+    }
 
     inline UString JSValue::toString(ExecState* exec) const