Changeset 119865 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.h

Timestamp:

Jun 8, 2012, 2:30:35 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed roll out r119795.

This broke jquery/core.html

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::emitAllocateBasicJSObject):

• jit/JITInlineMethods.h:

(JSC::JIT::emitAllocateBasicJSObject):

• llint/LowLevelInterpreter.asm:
• runtime/JSGlobalData.h:

(JSGlobalData):

• runtime/JSGlobalThis.cpp:

(JSC::JSGlobalThis::setUnwrappedObject):

• runtime/JSObject.cpp:

(JSC::JSObject::visitChildren):
(JSC::JSObject::createInheritorID):

• runtime/JSObject.h:

(JSObject):
(JSC::JSObject::resetInheritorID):
(JSC):
(JSC::JSObject::offsetOfInheritorID):
(JSC::JSObject::inheritorID):

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -237 +237 @@
         static size_t offsetOfInlineStorage();
         static size_t offsetOfPropertyStorage();
+        static size_t offsetOfInheritorID();
 
         static JS_EXPORTDATA const ClassInfo s_info;
@@ -264 +265 @@
         JSObject(JSGlobalData&, Structure*, PropertyStorage inlineStorage);
         
-        void resetInheritorID(JSGlobalData& globalData)
-        {
-            removeDirect(globalData, globalData.m_inheritorIDKey);
+        void resetInheritorID()
+        {
+            m_inheritorID.clear();
         }
 
@@ -303 +304 @@
 
         StorageBarrier m_propertyStorage;
-
-#if USE(JSVALUE32_64)
-        // FIXME: keep the size of JSObject a multiple of 64-bits, so that the
-        // internal storage is aligned. We can remove this when we remove JSCell's
-        // direct ClassInfo pointer.
-        void* sixtyFourBitAlign;
-#endif
+        WriteBarrier<Structure> m_inheritorID;
     };
 
@@ -317 +312 @@
 #define JSFinalObject_inlineStorageCapacity 6
 #else
-#define JSNonFinalObject_inlineStorageCapacity 3
-#define JSFinalObject_inlineStorageCapacity 5
+#define JSNonFinalObject_inlineStorageCapacity 2
+#define JSFinalObject_inlineStorageCapacity 4
 #endif
 
@@ -423 +418 @@
 }
 
+inline size_t JSObject::offsetOfInheritorID()
+{
+    return OBJECT_OFFSETOF(JSObject, m_inheritorID);
+}
+
 inline bool JSObject::isGlobalObject() const
 {
@@ -515 +515 @@
 inline Structure* JSObject::inheritorID(JSGlobalData& globalData)
 {
-    if (WriteBarrierBase<Unknown>* location = getDirectLocation(globalData, globalData.m_inheritorIDKey)) {
-        Structure* inheritorID = jsCast<Structure*>(location->get());
-        ASSERT(inheritorID->isEmpty());
-        return inheritorID;
+    if (m_inheritorID) {
+        ASSERT(m_inheritorID->isEmpty());
+        return m_inheritorID.get();
     }
     return createInheritorID(globalData);