JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / ArgList.cpp

diff --git a/runtime/ArgList.cpp b/runtime/ArgList.cpp
index ab2b5d7dae7143c5166aa943cb8abce37e4ba67e..c1aa9dd7a6935e6b98059c043bb3c4c80b4f46fb 100644 (file)
--- a/runtime/ArgList.cpp
+++ b/runtime/ArgList.cpp
@@ -23,6 +23,8 @@
 
 #include "JSValue.h"
 #include "JSCell.h"
 
 #include "JSValue.h"
 #include "JSCell.h"

+#include "JSObject.h"
+#include "ScopeChain.h"

 
 using std::min;
 
 
 using std::min;
 


@@ -37,12 +39,12 @@ void ArgList::getSlice(int startIndex, ArgList& result) const
     result = ArgList(m_args + startIndex, m_argCount - startIndex);
 }
 
     result = ArgList(m_args + startIndex, m_argCount - startIndex);
 }
 

-void MarkedArgumentBuffer::markLists(MarkStack& markStack, ListSet& markSet)
+void MarkedArgumentBuffer::markLists(HeapRootVisitor& heapRootMarker, ListSet& markSet)

 {
     ListSet::iterator end = markSet.end();
     for (ListSet::iterator it = markSet.begin(); it != end; ++it) {
         MarkedArgumentBuffer* list = *it;
 {
     ListSet::iterator end = markSet.end();
     for (ListSet::iterator it = markSet.begin(); it != end; ++it) {
         MarkedArgumentBuffer* list = *it;

-        markStack.appendValues(reinterpret_cast<JSValue*>(list->m_buffer), list->m_size);
+        heapRootMarker.mark(reinterpret_cast<JSValue*>(list->m_buffer), list->m_size);

     }
 }
 
     }
 }
 


@@ -54,8 +56,8 @@ void MarkedArgumentBuffer::slowAppend(JSValue v)
     // our Vector's inline capacity, though, our values move to the 
     // heap, where they do need explicit marking.
     if (!m_markSet) {
     // our Vector's inline capacity, though, our values move to the 
     // heap, where they do need explicit marking.
     if (!m_markSet) {

-        // We can only register for explicit marking once we know which heap
-        // is the current one, i.e., when a non-immediate value is appended.
+        // FIXME: Even if v is not a JSCell*, if previous values in the buffer
+        // are, then they won't be marked!

         if (Heap* heap = Heap::heap(v)) {
             ListSet& markSet = heap->markListSet();
             markSet.add(this);
         if (Heap* heap = Heap::heap(v)) {
             ListSet& markSet = heap->markListSet();
             markSet.add(this);