Changeset 119568 in webkit

Timestamp:

Jun 6, 2012 12:37:05 AM (12 years ago)

Author:

mitz@apple.com

Message:

Reverted r119567, the fix for <​http://webkit.org/b/88378>, because it broke the 32-bit build.

• 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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT.h (modified) (1 diff)
• jit/JITInlineMethods.h (modified) (1 diff)
• llint/LowLevelInterpreter.asm (modified) (1 diff)
• runtime/JSGlobalData.h (modified) (2 diffs)
• runtime/JSGlobalThis.cpp (modified) (1 diff)
• runtime/JSObject.cpp (modified) (3 diffs)
• runtime/JSObject.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-06-06  Dan Bernstein  <mitz@apple.com>
+
+        Reverted r119567, the fix for <http://webkit.org/b/88378>, because it broke the 32-bit build.
+
+        * 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):
+
 2012-06-05  Yuqiang Xian  <yuqiang.xian@intel.com>
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h

@@ -2122 +2122 @@
         m_jit.storePtr(MacroAssembler::TrustedImmPtr(&ClassType::s_info), MacroAssembler::Address(resultGPR, JSCell::classInfoOffset()));
         
+        // Initialize the object's inheritorID.
+        m_jit.storePtr(MacroAssembler::TrustedImmPtr(0), MacroAssembler::Address(resultGPR, JSObject::offsetOfInheritorID()));
+        
         // Initialize the object's property storage pointer.
         m_jit.addPtr(MacroAssembler::TrustedImm32(sizeof(JSObject)), resultGPR, scratchGPR);

trunk/Source/JavaScriptCore/jit/JITInlineMethods.h

@@ -426 +426 @@
     storePtr(TrustedImmPtr(&ClassType::s_info), Address(result, JSCell::classInfoOffset()));
 
+    // initialize the inheritor ID
+    storePtr(TrustedImmPtr(0), Address(result, JSObject::offsetOfInheritorID()));
+
     // initialize the object's property storage pointer
     addPtr(TrustedImm32(sizeof(JSObject)), result, storagePtr);

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -312 +312 @@
         storep scratch2, [result]
         storep structure, JSCell::m_structure[result]
+        storep 0, JSObject::m_inheritorID[result]
         addp sizeof JSObject, result, scratch1
         storep scratch1, JSObject::m_propertyStorage[result]

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -39 +39 @@
 #include "LLIntData.h"
 #include "NumericStrings.h"
-#include "PrivateName.h"
 #include "SmallStrings.h"
 #include "Strong.h"
@@ -283 +282 @@
 #endif
 
-        PrivateName m_inheritorIDKey;
-
         OwnPtr<ParserArena> parserArena;
         OwnPtr<Keywords> keywords;

trunk/Source/JavaScriptCore/runtime/JSGlobalThis.cpp

@@ -54 +54 @@
     m_unwrappedObject.set(globalData, this, globalObject);
     setPrototype(globalData, globalObject->prototype());
-    resetInheritorID(globalData);
+    resetInheritorID();
 }
 

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -99 +99 @@
     }
 
+    if (thisObject->m_inheritorID)
+        visitor.append(&thisObject->m_inheritorID);
+
 #if !ASSERT_DISABLED
     visitor.m_isCheckingForDefaultMarkViolation = wasCheckingForDefaultMarkViolation;
@@ -534 +537 @@
 Structure* JSObject::createInheritorID(JSGlobalData& globalData)
 {
-    ASSERT(!getDirectLocation(globalData, globalData.m_inheritorIDKey));
-
     JSGlobalObject* globalObject;
     if (isGlobalThis())
@@ -542 +543 @@
         globalObject = structure()->globalObject();
     ASSERT(globalObject);
-    
-    Structure* inheritorID = createEmptyObjectStructure(globalData, globalObject, this);
-    ASSERT(inheritorID->isEmpty());
-
-    PutPropertySlot slot;
-    putDirectInternal<PutModeDefineOwnProperty>(globalData, globalData.m_inheritorIDKey, inheritorID, 0, slot, 0);
-    return inheritorID;
+    m_inheritorID.set(globalData, this, createEmptyObjectStructure(globalData, globalObject, this));
+    ASSERT(m_inheritorID->isEmpty());
+    return m_inheritorID.get();
 }
 

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;
+        WriteBarrier<Structure> m_inheritorID;
     };
 
@@ -310 +312 @@
 #define JSFinalObject_inlineStorageCapacity 6
 #else
-#define JSNonFinalObject_inlineStorageCapacity 3
-#define JSFinalObject_inlineStorageCapacity 5
+#define JSNonFinalObject_inlineStorageCapacity 2
+#define JSFinalObject_inlineStorageCapacity 4
 #endif
 
@@ -416 +418 @@
 }
 
+inline size_t JSObject::offsetOfInheritorID()
+{
+    return OBJECT_OFFSETOF(JSObject, m_inheritorID);
+}
+
 inline bool JSObject::isGlobalObject() const
 {
@@ -508 +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);