Changeset 189515 in webkit

Timestamp:

Sep 8, 2015, 4:10:57 PM (10 years ago)

Author:

akling@apple.com

Message:

[JSC] Remove unused Heap::getConservativeRegisterRoots().
<​https://webkit.org/b/148974>

Reviewed by Geoffrey Garen.

Spotted this unused stack root gathering helper in Heap. Let's lose it.

• heap/Heap.cpp:

(JSC::Heap::getConservativeRegisterRoots): Deleted.

• interpreter/JSStack.cpp:

(JSC::JSStack::gatherConservativeRoots): Deleted.

• interpreter/JSStack.h:

(JSC::JSStack::gatherConservativeRoots): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (1 diff)
• heap/Heap.h (modified) (1 diff)
• interpreter/JSStack.cpp (modified) (1 diff)
• interpreter/JSStack.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-09-08  Andreas Kling  <akling@apple.com>
+
+        [JSC] Remove unused Heap::getConservativeRegisterRoots().
+        <https://webkit.org/b/148974>
+
+        Reviewed by Geoffrey Garen.
+
+        Spotted this unused stack root gathering helper in Heap. Let's lose it.
+
+        * heap/Heap.cpp:
+        (JSC::Heap::getConservativeRegisterRoots): Deleted.
+        * interpreter/JSStack.cpp:
+        (JSC::JSStack::gatherConservativeRoots): Deleted.
+        * interpreter/JSStack.h:
+        (JSC::JSStack::gatherConservativeRoots): Deleted.
+
 2015-09-08  Sukolsak Sakshuwong  <sukolsak@gmail.com>
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -511 +511 @@
 }
 
-void Heap::getConservativeRegisterRoots(HashSet<JSCell*>& roots)
-{
-    ASSERT(isValidThreadState(m_vm));
-    ConservativeRoots stackRoots(&m_objectSpace.blocks(), &m_storageSpace);
-    stack().gatherConservativeRoots(stackRoots);
-    size_t stackRootCount = stackRoots.size();
-    JSCell** registerRoots = stackRoots.roots();
-    for (size_t i = 0; i < stackRootCount; i++) {
-        setMarked(registerRoots[i]);
-        registerRoots[i]->setMarked();
-        roots.add(registerRoots[i]);
-    }
-}
-
 void Heap::markRoots(double gcStartTime, void* stackOrigin, void* stackTop, MachineThreads::RegisterState& calleeSavedRegisters)
 {

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -198 +198 @@
     void willStartIterating();
     void didFinishIterating();
-    void getConservativeRegisterRoots(HashSet<JSCell*>& roots);
 
     double lastFullGCLength() const { return m_lastFullGCLength; }

trunk/Source/JavaScriptCore/interpreter/JSStack.cpp

@@ -103 +103 @@
 }
 
-void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
-{
-    conservativeRoots.add(topOfStack() + 1, highAddress());
-}
-
 void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
 {

trunk/Source/JavaScriptCore/interpreter/JSStack.h

@@ -80 +80 @@
 
 #if ENABLE(JIT)
-        void gatherConservativeRoots(ConservativeRoots&) { }
         void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&) { }
         void sanitizeStack() { }
@@ -86 +85 @@
         ~JSStack();
 
-        void gatherConservativeRoots(ConservativeRoots&);
         void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&);
         void sanitizeStack();