Changeset 96831 in webkit for trunk/Source/JavaScriptCore/runtime

Timestamp:

Oct 6, 2011, 10:42:50 AM (14 years ago)

Author:

[email protected]

Message:

JSC objects need to know their own cell size at runtime.
​https://bugs.webkit.org/show_bug.cgi?id=69390

Reviewed by Geoffrey Garen.

Added the cellSize field to ClassInfo and the static calculation of
size of each class to the CREATE_METHOD_TABLE macro, which will be
renamed in a followup patch to make its name match its broader use.

Also added a few ClassInfo structs so that each object that is allocated has its
correct size.

• JavaScriptCore.exp:
• runtime/ClassInfo.h:

Changed JSByteArray s_defaultInfo to s_info so that the template will get the
correct ClassInfo struct from it when it's allocated.

• runtime/JSByteArray.cpp:
• runtime/JSByteArray.h:
• runtime/JSCell.h:

(JSC::allocateCell):

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

(JSC::JSCell::cellSize):

• runtime/JSStaticScopeObject.cpp:
• runtime/JSStaticScopeObject.h:
• runtime/StrictEvalActivation.cpp:
• runtime/StrictEvalActivation.h:

Location:

trunk/Source/JavaScriptCore/runtime

Files:

• ClassInfo.h (modified) (2 diffs)
• JSByteArray.cpp (modified) (1 diff)
• JSByteArray.h (modified) (2 diffs)
• JSCell.h (modified) (1 diff)
• JSNotAnObject.cpp (modified) (1 diff)
• JSNotAnObject.h (modified) (1 diff)
• JSObject.cpp (modified) (1 diff)
• JSObject.h (modified) (1 diff)
• JSStaticScopeObject.cpp (modified) (1 diff)
• JSStaticScopeObject.h (modified) (1 diff)
• StrictEvalActivation.cpp (modified) (1 diff)
• StrictEvalActivation.h (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/ClassInfo.h

@@ -42 +42 @@
         &ClassName::visitChildren, \
         &ClassName::getCallData \
-    }
+    }, \
+    sizeof(ClassName)
 
     struct ClassInfo {
@@ -80 +81 @@
 
         MethodTable methodTable;
+
+        size_t cellSize;
     };
 

trunk/Source/JavaScriptCore/runtime/JSByteArray.cpp

@@ -34 +34 @@
 namespace JSC {
 
-const ClassInfo JSByteArray::s_defaultInfo = { "ByteArray", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSByteArray) };
+const ClassInfo JSByteArray::s_info = { "ByteArray", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSByteArray) };
 
 JSByteArray::JSByteArray(ExecState* exec, Structure* structure, ByteArray* storage)

trunk/Source/JavaScriptCore/runtime/JSByteArray.h

@@ -87 +87 @@
         }
 
-        static Structure* createStructure(JSGlobalData&, JSGlobalObject*, JSValue prototype, const JSC::ClassInfo* = &s_defaultInfo);
+        static Structure* createStructure(JSGlobalData&, JSGlobalObject*, JSValue prototype, const JSC::ClassInfo* = &s_info);
 
         virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
@@ -97 +97 @@
         virtual void getOwnPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
 
-        static const ClassInfo s_defaultInfo;
+        static const ClassInfo s_info;
         
         size_t length() const { return m_storage->length(); }

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -320 +320 @@
     {
 #if ENABLE(GC_VALIDATION)
+        ASSERT(sizeof(T) == T::s_info.cellSize);
         ASSERT(!heap.globalData()->isInitializingObject());
         heap.globalData()->setInitializingObject(true);

trunk/Source/JavaScriptCore/runtime/JSNotAnObject.cpp

@@ -36 +36 @@
 
 ASSERT_CLASS_FITS_IN_CELL(JSNotAnObject);
+
+const ClassInfo JSNotAnObject::s_info = { "Object", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSNotAnObject) };
 
 // JSValue methods

trunk/Source/JavaScriptCore/runtime/JSNotAnObject.h

@@ -59 +59 @@
         }
 
+        static const ClassInfo s_info;
+
      private:
         

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -49 +49 @@
 
 const ClassInfo JSObject::s_info = { "Object", 0, 0, 0, CREATE_METHOD_TABLE(JSObject) };
+
+const ClassInfo JSFinalObject::s_info = { "Object", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSFinalObject) };
 
 static inline void getClassPropertyNames(ExecState* exec, const ClassInfo* classInfo, PropertyNameArray& propertyNames, EnumerationMode mode)

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -366 +366 @@
         }
 
+        static const ClassInfo s_info;
+
     protected:
         void finishCreation(JSGlobalData& globalData)

trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.cpp

@@ -32 +32 @@
 namespace JSC {
 ASSERT_CLASS_FITS_IN_CELL(JSStaticScopeObject);
+
+const ClassInfo JSStaticScopeObject::s_info = { "Object", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSStaticScopeObject) };
 
 void JSStaticScopeObject::visitChildren(JSCell* cell, SlotVisitor& visitor)

trunk/Source/JavaScriptCore/runtime/JSStaticScopeObject.h

@@ -51 +51 @@
         static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue proto) { return Structure::create(globalData, globalObject, proto, TypeInfo(ObjectType, StructureFlags), &s_info); }
 
+        static const ClassInfo s_info;
+
     protected:
         void finishCreation(ExecState* exec, const Identifier& identifier, JSValue value, unsigned attributes)

trunk/Source/JavaScriptCore/runtime/StrictEvalActivation.cpp

@@ -29 +29 @@
 namespace JSC {
 
+const ClassInfo StrictEvalActivation::s_info = { "Object", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(StrictEvalActivation) };
+
 StrictEvalActivation::StrictEvalActivation(ExecState* exec)
     : JSNonFinalObject(exec->globalData(), exec->globalData().strictEvalActivationStructure.get())

trunk/Source/JavaScriptCore/runtime/StrictEvalActivation.h

@@ -50 +50 @@
     }
     
+    static const ClassInfo s_info;
+
 protected:
     static const unsigned StructureFlags = IsEnvironmentRecord | JSNonFinalObject::StructureFlags;