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

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.cpp (modified) (3 diffs)

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();
 }