Index: test/cctest/test-heap.cc |
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc |
index f94fe53ca6c5771a19182693e50a7a7fbef891c3..152842befb814607c84f05200723614666a86570 100644 |
--- a/test/cctest/test-heap.cc |
+++ b/test/cctest/test-heap.cc |
@@ -50,7 +50,11 @@ static void InitializeVM() { |
// 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->sweeping_pending()) { |
Michael Starzinger
2013/03/11 09:50:26
There already is a predicate IsConcurrentSweepingI
Hannes Payer (out of office)
2013/03/11 10:14:52
Done.
Hannes Payer (out of office)
2013/03/11 10:14:52
Done.
|
+ collector->WaitUntilSweepingCompleted(); |
+ } |
CHECK(marking->IsMarking() || marking->IsStopped()); |
if (marking->IsStopped()) { |
marking->Start(); |