Version 3.17.10

Fixed heap snapshot creation for Harmony collections. (issue 2535)

Fixed register allocation corner case. (Chromium issue 177883)

Performance and stability improvements on all platforms.

git-svn-id: http://v8.googlecode.com/svn/trunk@13921 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index f94fe53..7cdae6b 100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -50,7 +50,11 @@
 
 // Go through all incremental marking steps in one swoop.
 static void SimulateIncrementalMarking() {
+  MarkCompactCollector* collector = HEAP->mark_compact_collector();
   IncrementalMarking* marking = HEAP->incremental_marking();
+  if (collector->IsConcurrentSweepingInProgress()) {
+    collector->WaitUntilSweepingCompleted();
+  }
   CHECK(marking->IsMarking() || marking->IsStopped());
   if (marking->IsStopped()) {
     marking->Start();