Changeset 178284 in webkit for trunk/Source/JavaScriptCore/heap/Heap.cpp

Timestamp:

Jan 12, 2015, 10:26:11 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r178266.
​https://bugs.webkit.org/show_bug.cgi?id=140363

Broke a JSC test (Requested by ap on #webkit).

Reverted changeset:

"Local JSArray* "keys" in objectConstructorKeys() is not
marked during garbage collection"
​https://bugs.webkit.org/show_bug.cgi?id=140348
​http://trac.webkit.org/changeset/178266

File:

• trunk/Source/JavaScriptCore/heap/Heap.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -505 +505 @@
     // We gather conservative roots before clearing mark bits because conservative
     // gathering uses the mark bits to determine whether a reference is valid.
+    void* dummy;
     ConservativeRoots conservativeRoots(&m_objectSpace.blocks(), &m_storageSpace);
-    gatherStackRoots(conservativeRoots);
+    gatherStackRoots(conservativeRoots, &dummy);
     gatherJSStackRoots(conservativeRoots);
     gatherScratchBufferRoots(conservativeRoots);
@@ -566 +567 @@
 }
 
-void Heap::gatherStackRoots(ConservativeRoots& roots)
+void Heap::gatherStackRoots(ConservativeRoots& roots, void** dummy)
 {
     GCPHASE(GatherStackRoots);
     m_jitStubRoutines.clearMarks();
-    m_machineThreads.gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks);
+    m_machineThreads.gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks, dummy);
 }