Changeset 37712 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.h

Timestamp:

Oct 19, 2008, 10:58:02 PM (17 years ago)

Author:

Darin Adler

Message:

2008-10-19 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

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

Change JSValuePtr from a typedef into a class. This allows us to support
conversion from JSCell* to JSValuePtr even if JSCell isn't derived from
JSValue.

• JavaScriptCore.exp: Updated symbols that involve JSValuePtr, since it's now a distinct type.

• API/APICast.h: (toRef): Extract the JSValuePtr payload explicitly since we can't just cast any more.
• VM/CTI.cpp: (JSC::CTI::asInteger): Ditto.

• VM/CodeGenerator.cpp: (JSC::CodeGenerator::addConstant): Get at the payload directly. (JSC::CodeGenerator::emitLoad): Added an overload of JSCell* because otherwise classes derived from JSValue end up calling the bool overload instead of JSValuePtr.
• VM/CodeGenerator.h: Ditto. Also update traits to use JSValue* and the payload functions.

• VM/Register.h: Added a JSCell* overload and use of payload functions.

• kjs/JSCell.h: (JSC::asCell): Use payload function. (JSC::JSValue::asCell): Use JSValue* instead of JSValuePtr. (JSC::JSValuePtr::JSValuePtr): Added. Constructor that takes JSCell* and creates a JSValuePtr.

• kjs/JSImmediate.h: Added JSValuePtr class. Also updated makeValue and makeInt to work with JSValue* and the payload function.

• kjs/JSValue.h: Added == and != operators for JSValuePtr. Put them here because eventually all the JSValue functions should go here except what's needed by JSImmediate. Also fix asValue to use JSValue* instead of JSValuePtr.

• kjs/PropertySlot.h: Change constructor to take JSValuePtr.

• kjs/protect.h: Update gcProtect functions to work with JSCell* as well as JSValuePtr. Also updated the ProtectedPtr<JSValuePtr> specialization to work more directly. Also changed all the call sites to use gcProtectNullTolerant.

File:

• trunk/JavaScriptCore/VM/CodeGenerator.h (modified) (3 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.h

@@ -230 +230 @@
         RegisterID* emitLoad(RegisterID* dst, const Identifier&);
         RegisterID* emitLoad(RegisterID* dst, JSValuePtr);
+        RegisterID* emitLoad(RegisterID* dst, JSCell*);
         RegisterID* emitUnexpectedLoad(RegisterID* dst, bool);
         RegisterID* emitUnexpectedLoad(RegisterID* dst, double);
@@ -330 +331 @@
         PassRefPtr<LabelID> emitComplexJumpScopes(LabelID* target, ControlFlowContext* topScope, ControlFlowContext* bottomScope);
 
-        struct JSValueHashTraits : HashTraits<JSValuePtr> {
-            static void constructDeletedValue(JSValuePtr& slot) { slot = JSImmediate::impossibleValue(); }
-            static bool isDeletedValue(JSValuePtr value) { return value == JSImmediate::impossibleValue(); }
+        struct JSValueHashTraits : HashTraits<JSValue*> {
+            static void constructDeletedValue(JSValue*& slot) { slot = JSImmediate::impossibleValue().payload(); }
+            static bool isDeletedValue(JSValue* value) { return value == JSImmediate::impossibleValue().payload(); }
         };
 
-        typedef HashMap<JSValuePtr, unsigned, PtrHash<JSValuePtr>, JSValueHashTraits> JSValueMap;
+        typedef HashMap<JSValue*, unsigned, PtrHash<JSValue*>, JSValueHashTraits> JSValueMap;
 
         struct IdentifierMapIndexHashTraits {
@@ -399 +400 @@
         RegisterID* addConstant(JSValuePtr);
         unsigned addUnexpectedConstant(JSValuePtr);
-        unsigned addRegExp(RegExp* r);
+        unsigned addRegExp(RegExp*);
         StructureID* addStructureID();