Changeset 116822 in webkit for trunk/Source/JavaScriptCore/heap/MarkStack.cpp

Timestamp:

May 11, 2012, 4:50:02 PM (13 years ago)

Author:

[email protected]

Message:

Rolling out r116659.

Causes ASSERT failures on bots.

Rubber stamped by Geoff Garen.

• heap/Heap.cpp:

(JSC::Heap::markRoots):

• heap/MarkStack.cpp:

(JSC::MarkStackThreadSharedData::markingThreadMain):
(JSC::MarkStackThreadSharedData::markingThreadStartFunc):
(JSC::MarkStackThreadSharedData::MarkStackThreadSharedData):
(JSC::MarkStackThreadSharedData::reset):
(JSC::MarkStack::reset):
(JSC):
(JSC::SlotVisitor::copyAndAppend):

• heap/MarkStack.h:

(MarkStackThreadSharedData):
(MarkStack):

• runtime/JSString.h:

(JSString):
(JSC::JSString::finishCreation):
(JSC::JSString::is8Bit):
(JSC::JSRopeString::finishCreation):

File:

• trunk/Source/JavaScriptCore/heap/MarkStack.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/heap/MarkStack.cpp

@@ -37 +37 @@
 #include "ScopeChain.h"
 #include "Structure.h"
-#include "UString.h"
 #include "WriteBarrier.h"
 #include <wtf/MainThread.h>
@@ -220 +219 @@
 
 #if ENABLE(PARALLEL_GC)
-void MarkStackThreadSharedData::resetChildren()
-{
-    for (unsigned i = 0; i < m_slaveMarkStacks.size(); ++i)
-       m_slaveMarkStacks[i]->reset();
-}
-
-void MarkStackThreadSharedData::markingThreadMain(SlotVisitor* slotVisitor)
+void MarkStackThreadSharedData::markingThreadMain()
 {
     WTF::registerGCThread();
     {
-        ParallelModeEnabler enabler(*slotVisitor);
-        slotVisitor->drainFromShared(SlotVisitor::SlaveDrain);
-    }
-    delete slotVisitor;
-}
-
-void MarkStackThreadSharedData::markingThreadStartFunc(void* myVisitor)
-{
-    SlotVisitor* slotVisitor = static_cast<SlotVisitor*>(myVisitor);
-    slotVisitor->sharedData().markingThreadMain(slotVisitor);
+        SlotVisitor slotVisitor(*this);
+        ParallelModeEnabler enabler(slotVisitor);
+        slotVisitor.drainFromShared(SlotVisitor::SlaveDrain);
+    }
+}
+
+void MarkStackThreadSharedData::markingThreadStartFunc(void* shared)
+{
+    static_cast<MarkStackThreadSharedData*>(shared)->markingThreadMain();
 }
 #endif
@@ -252 +244 @@
 #if ENABLE(PARALLEL_GC)
     for (unsigned i = 1; i < Options::numberOfGCMarkers; ++i) {
-        SlotVisitor* slotVisitor = new SlotVisitor(*this);
-        m_slaveMarkStacks.append(slotVisitor);
-        m_markingThreads.append(createThread(markingThreadStartFunc, slotVisitor, "JavaScriptCore::Marking"));
+        m_markingThreads.append(createThread(markingThreadStartFunc, this, "JavaScriptCore::Marking"));
         ASSERT(m_markingThreads.last());
     }
@@ -286 +276 @@
     ASSERT(m_opaqueRoots.isEmpty());
 #endif
+    
     m_weakReferenceHarvesters.removeAll();
 }
@@ -298 +289 @@
     m_opaqueRoots.clear();
 #endif
-    m_uniqueStrings.clear();
 }
 
@@ -499 +489 @@
 }
 
-inline void MarkStack::internalAppend(JSValue* slot)
-{
-    ASSERT(slot);
-    JSValue value = *slot;
-    ASSERT(value);
-    if (!value.isCell())
-        return;
-
-    if (value.isString()) {
-        JSString* string = jsCast<JSString*>(value.asCell());
-        if (!string->isHashConstSingleton() && string->length() > 1 && !string->isRope()) {
-            UniqueStringMap::AddResult addResult = m_uniqueStrings.add(string->string().impl(), value);
-            if (addResult.isNewEntry)
-                string->setHashConstSingleton();
-            else {
-                JSValue existingJSValue = addResult.iterator->second;
-                if (value != existingJSValue)
-                    jsCast<JSString*>(existingJSValue.asCell())->clearHashConstSingleton();
-                *slot = existingJSValue;
-                return;
-            }
-        }
-    }
-
-    internalAppend(value.asCell());
-}
-
-
 void SlotVisitor::copyAndAppend(void** ptr, size_t bytes, JSValue* values, unsigned length)
 {
@@ -540 +502 @@
             if (!value)
                 continue;
-            internalAppend(&newValues[i]);
+            internalAppend(value);
         }