Changeset 81191 in webkit for trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp

Timestamp:

Mar 15, 2011, 4:29:56 PM (14 years ago)

Author:

[email protected]

Message:

2011-03-15 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Removed a few more deprecatedAppends, and removed HeapRoot<T>
​https://bugs.webkit.org/show_bug.cgi?id=56422

Added HeapRootMarker, a privileged class for marking direct heap roots
that are iterated during each garbage collection. This is easier to use
and more reliable than HeapRoot<T>, so I've removed HeapRoot<T>.

• debugger/Debugger.cpp: (JSC::evaluateInGlobalCallFrame):
• debugger/DebuggerCallFrame.cpp: (JSC::DebuggerCallFrame::evaluate):
• interpreter/CallFrame.h: (JSC::ExecState::exception):
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):
• runtime/Completion.cpp: (JSC::evaluate): exception is no longer a HeapRoot<T>, so no need to call .get() on it.

• runtime/Heap.cpp: (JSC::Heap::markProtectedObjects): (JSC::Heap::markTempSortVectors): (JSC::Heap::markRoots):
• runtime/Heap.h: Updated to use HeapRootMarker.

• runtime/JSCell.h: (JSC::JSCell::MarkStack::append): Added private functions for HeapRootMarker to use.

• runtime/JSGlobalData.h: exception is no longer a HeapRoot<T>.

• runtime/MarkStack.h: (JSC::HeapRootMarker::HeapRootMarker): (JSC::HeapRootMarker::mark): Added private functions for HeapRootMarker to use.

• runtime/SmallStrings.cpp: (JSC::SmallStrings::markChildren): Updated to use HeapRootMarker.

• runtime/SmallStrings.h: (JSC::SmallStrings::emptyString): (JSC::SmallStrings::singleCharacterString): (JSC::SmallStrings::singleCharacterStrings): Updated to use HeapRootMarker.

• runtime/WriteBarrier.h: Removed HeapRoot<T>.

File:

• trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp

@@ -75 +75 @@
 }
 
-void SmallStrings::markChildren(MarkStack& markStack)
+void SmallStrings::markChildren(HeapRootMarker& heapRootMarker)
 {
     /*
@@ -87 +87 @@
      */
 
-    bool isAnyStringMarked = isMarked(m_emptyString.get());
+    bool isAnyStringMarked = isMarked(m_emptyString);
     for (unsigned i = 0; i < singleCharacterStringCount && !isAnyStringMarked; ++i)
-        isAnyStringMarked = isMarked(m_singleCharacterStrings[i].get());
+        isAnyStringMarked = isMarked(m_singleCharacterStrings[i]);
     
     if (!isAnyStringMarked) {
@@ -97 +97 @@
     
     if (m_emptyString)
-        markStack.append(&m_emptyString);
+        heapRootMarker.mark(&m_emptyString);
     for (unsigned i = 0; i < singleCharacterStringCount; ++i) {
         if (m_singleCharacterStrings[i])
-            markStack.append(&m_singleCharacterStrings[i]);
+            heapRootMarker.mark(&m_singleCharacterStrings[i]);
     }
 }