JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / heap / CopyVisitor.cpp

diff --git a/heap/CopyVisitor.cpp b/heap/CopyVisitor.cpp
index 281d4bd3b186f51685660325dc0ec8359bc41227..5dd8419232384c6395fd4529410c2d8af273bc30 100644 (file)
--- a/heap/CopyVisitor.cpp
+++ b/heap/CopyVisitor.cpp
@@ -26,11 +26,13 @@
 #include "config.h"
 #include "CopyVisitor.h"
 
 #include "config.h"
 #include "CopyVisitor.h"
 

+#include "CopiedSpaceInlines.h"

 #include "CopyVisitorInlines.h"
 #include "CopyWorkList.h"
 #include "GCThreadSharedData.h"
 #include "JSCell.h"
 #include "JSObject.h"
 #include "CopyVisitorInlines.h"
 #include "CopyWorkList.h"
 #include "GCThreadSharedData.h"
 #include "JSCell.h"
 #include "JSObject.h"

+#include "JSCInlines.h"

 #include <wtf/Threading.h>
 
 namespace JSC {
 #include <wtf/Threading.h>
 
 namespace JSC {


@@ -52,10 +54,10 @@ void CopyVisitor::copyFromShared()
 
             CopyWorkList& workList = block->workList();
             for (CopyWorkList::iterator it = workList.begin(); it != workList.end(); ++it)
 
             CopyWorkList& workList = block->workList();
             for (CopyWorkList::iterator it = workList.begin(); it != workList.end(); ++it)

-                visitCell(*it);
+                visitItem(*it);

 
             ASSERT(!block->liveBytes());
 
             ASSERT(!block->liveBytes());

-            m_shared.m_copiedSpace->recycleEvacuatedBlock(block);
+            m_shared.m_copiedSpace->recycleEvacuatedBlock(block, m_shared.m_vm->heap.operationInProgress());

         }
         m_shared.getNextBlocksToCopy(next, end);
     }
         }
         m_shared.getNextBlocksToCopy(next, end);
     }