Changeset 37714 in webkit for trunk/JavaScriptCore/kjs/JSValue.h

Timestamp:

Oct 20, 2008, 12:29:28 AM (17 years ago)

Author:

Darin Adler

Message:

2008-10-19 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

• finish ​https://bugs.webkit.org/show_bug.cgi?id=21732 improve performance by eliminating JSValue as a base class for JSCell

• VM/Machine.cpp: (JSC::Machine::cti_op_call_profiler): Use asFunction. (JSC::Machine::cti_vm_lazyLinkCall): Ditto. (JSC::Machine::cti_op_construct_JSConstructFast): Use asObject.

• kjs/JSCell.h: Re-sort friend classes. Eliminate inheritance from JSValue. Changed cast in asCell from static_cast to reinterpret_cast. Removed JSValue::getNumber(double&) and one of JSValue::getObject overloads.

• kjs/JSValue.h: Made the private constructor and destructor both non-virtual and also remove the definitions. This class can never be instantiated or derived.

File:

• trunk/JavaScriptCore/kjs/JSValue.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/JSValue.h

@@ -36 +36 @@
 namespace JSC {
 
-    class ExecState;
     class Identifier;
-    class JSCell;
-    class JSObject;
     class JSString;
     class PropertySlot;
     class PutPropertySlot;
-    class StructureID;
 
     struct ClassInfo;
@@ -50 +46 @@
     enum PreferredPrimitiveType { NoPreference, PreferNumber, PreferString };
 
-    /**
-     * JSValue is the base type for all primitives (Undefined, Null, Boolean,
-     * String, Number) and objects in ECMAScript.
-     *
-     * Note: you should never inherit from JSValue as it is for primitive types
-     * only (all of which are provided internally by KJS). Instead, inherit from
-     * JSObject.
-     */
     class JSValue : Noncopyable {
-        friend class JSCell; // so it can derive from this class
     private:
         JSValue();
-        virtual ~JSValue();
+        ~JSValue();
 
     public:
@@ -74 +61 @@
         bool isGetterSetter() const;
         bool isObject() const;
-        bool isObject(const ClassInfo*) const; // FIXME: Merge with inherits.
+        bool isObject(const ClassInfo*) const;
         
         // Extracting the value.
         bool getBoolean(bool&) const;
         bool getBoolean() const; // false if not a boolean
-        bool getNumber(double&) const;
         double getNumber() const; // NaN if not a number
         double uncheckedGetNumber() const;
         bool getString(UString&) const;
         UString getString() const; // null string if not a string
-        JSObject* getObject(); // NULL if not an object
-        const JSObject* getObject() const; // NULL if not an object
+        JSObject* getObject() const; // 0 if not an object
 
         CallType getCallData(CallData&);
@@ -105 +90 @@
         double toNumber(ExecState*) const;
         JSValuePtr toJSNumber(ExecState*) const; // Fast path for when you expect that the value is an immediate number.
+
         UString toString(ExecState*) const;
         JSObject* toObject(ExecState*) const;
@@ -160 +146 @@
     uint32_t toUInt32SlowCase(double, bool& ok);
 
-    inline JSValue::JSValue()
-    {
-    }
-
-    inline JSValue::~JSValue()
-    {
-    }
-
     inline JSValuePtr JSValue::asValue() const
     {