Changeset 178284 in webkit for trunk/Source/JavaScriptCore/heap

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

Location:

trunk/Source/JavaScriptCore/heap

Files:

• Heap.cpp (modified) (2 diffs)
• Heap.h (modified) (1 diff)
• MachineStackMarker.cpp (modified) (3 diffs)
• MachineStackMarker.h (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);
 }
 

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -276 +276 @@
 
     void markRoots(double gcStartTime);
-    void gatherStackRoots(ConservativeRoots&);
+    void gatherStackRoots(ConservativeRoots&, void** dummy);
     void gatherJSStackRoots(ConservativeRoots&);
     void gatherScratchBufferRoots(ConservativeRoots&);

trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp

@@ -222 +222 @@
 #endif
 
-void MachineThreads::gatherFromCurrentThread(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
+void MachineThreads::gatherFromCurrentThread(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks, void* stackCurrent)
 {
     // setjmp forces volatile registers onto the stack
     jmp_buf registers REGISTER_BUFFER_ALIGNMENT;
-
 #if COMPILER(MSVC)
 #pragma warning(push)
@@ -240 +239 @@
     conservativeRoots.add(registersBegin, registersEnd, jitStubRoutines, codeBlocks);
 
-    // We need to mark the stack top in this function so that callee saves are either already on the stack,
-    // or will be saved in registers.
-    void* stackBegin = &registers;
+    void* stackBegin = stackCurrent;
     void* stackEnd = wtfThreadData().stack().origin();
     conservativeRoots.add(stackBegin, stackEnd, jitStubRoutines, codeBlocks);
@@ -449 +446 @@
 }
 
-void MachineThreads::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
-{
-    gatherFromCurrentThread(conservativeRoots, jitStubRoutines, codeBlocks);
+void MachineThreads::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks, void* stackCurrent)
+{
+    gatherFromCurrentThread(conservativeRoots, jitStubRoutines, codeBlocks, stackCurrent);
 
     if (m_threadSpecific) {

trunk/Source/JavaScriptCore/heap/MachineStackMarker.h

@@ -40 +40 @@
         ~MachineThreads();
 
-        void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&);
+        void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&, void* stackCurrent);
 
         JS_EXPORT_PRIVATE void makeUsableFromMultipleThreads();
@@ -46 +46 @@
 
     private:
-        void gatherFromCurrentThread(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&);
+        void gatherFromCurrentThread(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&, void* stackCurrent);
 
         class Thread;