Changeset 87450 in webkit

Timestamp:

May 26, 2011 4:47:40 PM (13 years ago)

Author:

ggaren@apple.com

Message:

2011-05-26 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Oliver Hunt.

Renamed heapRootMarker to heapRootVisitor to match its class name
​https://bugs.webkit.org/show_bug.cgi?id=61584

• heap/Heap.cpp: (JSC::Heap::markProtectedObjects): (JSC::Heap::markTempSortVectors): (JSC::Heap::markRoots):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-05-26  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Renamed heapRootMarker to heapRootVisitor to match its class name
+        https://bugs.webkit.org/show_bug.cgi?id=61584
+
+        * heap/Heap.cpp:
+        (JSC::Heap::markProtectedObjects):
+        (JSC::Heap::markTempSortVectors):
+        (JSC::Heap::markRoots):
+
 2011-05-26  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -176 +176 @@
 }
 
-void Heap::markProtectedObjects(HeapRootVisitor& heapRootMarker)
+void Heap::markProtectedObjects(HeapRootVisitor& heapRootVisitor)
 {
     ProtectCountSet::iterator end = m_protectedValues.end();
     for (ProtectCountSet::iterator it = m_protectedValues.begin(); it != end; ++it)
-        heapRootMarker.mark(&it->first);
+        heapRootVisitor.mark(&it->first);
 }
 
@@ -194 +194 @@
 }
     
-void Heap::markTempSortVectors(HeapRootVisitor& heapRootMarker)
+void Heap::markTempSortVectors(HeapRootVisitor& heapRootVisitor)
 {
     typedef Vector<Vector<ValueStringPair>* > VectorOfValueStringVectors;
@@ -205 +205 @@
         for (Vector<ValueStringPair>::iterator vectorIt = tempSortingVector->begin(); vectorIt != vectorEnd; ++vectorIt) {
             if (vectorIt->first)
-                heapRootMarker.mark(&vectorIt->first);
+                heapRootVisitor.mark(&vectorIt->first);
         }
     }
@@ -225 +225 @@
 
     MarkStack& visitor = m_markStack;
-    HeapRootVisitor heapRootMarker(visitor);
+    HeapRootVisitor heapRootVisitor(visitor);
 
     // We gather conservative roots before clearing mark bits because conservative
@@ -243 +243 @@
     visitor.drain();
 
-    markProtectedObjects(heapRootMarker);
+    markProtectedObjects(heapRootVisitor);
     visitor.drain();
     
-    markTempSortVectors(heapRootMarker);
+    markTempSortVectors(heapRootVisitor);
     visitor.drain();
 
     if (m_markListSet && m_markListSet->size())
-        MarkedArgumentBuffer::markLists(heapRootMarker, *m_markListSet);
+        MarkedArgumentBuffer::markLists(heapRootVisitor, *m_markListSet);
     if (m_globalData->exception)
-        heapRootMarker.mark(&m_globalData->exception);
-    visitor.drain();
-
-    m_handleHeap.markStrongHandles(heapRootMarker);
-    visitor.drain();
-
-    m_handleStack.mark(heapRootMarker);
+        heapRootVisitor.mark(&m_globalData->exception);
+    visitor.drain();
+
+    m_handleHeap.markStrongHandles(heapRootVisitor);
+    visitor.drain();
+
+    m_handleStack.mark(heapRootVisitor);
     visitor.drain();
 
@@ -266 +266 @@
     do {
         lastOpaqueRootCount = visitor.opaqueRootCount();
-        m_handleHeap.markWeakHandles(heapRootMarker);
+        m_handleHeap.markWeakHandles(heapRootVisitor);
         visitor.drain();
     // If the set of opaque roots has grown, more weak handles may have become reachable.