Changeset 38467 in webkit for trunk/JavaScriptCore/runtime/JSVariableObject.h

Timestamp:

Nov 16, 2008, 7:02:43 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-16 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Renamed OBJECT_OFFSET => FIELD_OFFSET

Nixed use of OBJECT_OFFSET outside of CTI.cpp by making CTI a friend in
more places.

• VM/CTI.cpp: (JSC::CTI::compileOpCallInitializeCallFrame): (JSC::CTI::compileOpCall): (JSC::CTI::emitSlowScriptCheck): (JSC::CTI::putDoubleResultToJSNumberCellOrJSImmediate): (JSC::CTI::compileBinaryArithOp): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases): (JSC::CTI::privateCompile): (JSC::CTI::privateCompileGetByIdSelf): (JSC::CTI::privateCompileGetByIdProto): (JSC::CTI::privateCompileGetByIdChain): (JSC::CTI::privateCompilePutByIdReplace): (JSC::CTI::privateCompilePutByIdTransition): (JSC::CTI::privateCompileCTIMachineTrampolines): (JSC::CTI::privateCompilePatchGetArrayLength): (JSC::CTI::emitGetVariableObjectRegister): (JSC::CTI::emitPutVariableObjectRegister):
• runtime/JSValue.h:
• runtime/JSVariableObject.h:

File:

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

trunk/JavaScriptCore/runtime/JSVariableObject.h

@@ -42 +42 @@
 
     class JSVariableObject : public JSObject {
+        friend class CTI;
+
     public:
         SymbolTable& symbolTable() const { return *d->symbolTable; }
@@ -73 +75 @@
             OwnArrayPtr<Register> registerArray; // Independent copy of registers, used when a variable object copies its registers out of the register file.
 
-            static inline ptrdiff_t offsetOf_registers()
-            {
-                return OBJECT_OFFSET(JSVariableObjectData, registers);
-            }
-
         private:
             JSVariableObjectData(const JSVariableObjectData&);
@@ -98 +95 @@
 
         JSVariableObjectData* d;
-
-    public:
-        static inline ptrdiff_t offsetOf_d()
-        {
-            return OBJECT_OFFSET(JSVariableObject, d);
-        }
-
-        static inline ptrdiff_t offsetOf_Data_registers()
-        {
-            return JSVariableObjectData::offsetOf_registers();
-        }
     };