Chromium Code Reviews| Index: test/cctest/cctest.h |
| diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h |
| index 5c19195208eaaa88b3647c0559dab2691ce9f2f3..98719f938f2d4c75e13007834c6b1da974f62911 100644 |
| --- a/test/cctest/cctest.h |
| +++ b/test/cctest/cctest.h |
| @@ -555,7 +555,8 @@ static inline void SimulateFullSpace(v8::internal::PagedSpace* space) { |
| // Helper function that simulates many incremental marking steps until |
| // marking is completed. |
| -static inline void SimulateIncrementalMarking(i::Heap* heap) { |
| +static inline void SimulateIncrementalMarking(i::Heap* heap, |
| + bool complete = true) { |
|
Michael Lippautz
2015/08/20 11:14:39
nit: naming
Hannes Payer (out of office)
2015/08/20 11:39:17
Done.
|
| i::MarkCompactCollector* collector = heap->mark_compact_collector(); |
| i::IncrementalMarking* marking = heap->incremental_marking(); |
| if (collector->sweeping_in_progress()) { |
| @@ -566,6 +567,8 @@ static inline void SimulateIncrementalMarking(i::Heap* heap) { |
| marking->Start(i::Heap::kNoGCFlags); |
| } |
| CHECK(marking->IsMarking()); |
| + if (!complete) return; |
| + |
| while (!marking->IsComplete()) { |
| marking->Step(i::MB, i::IncrementalMarking::NO_GC_VIA_STACK_GUARD); |
| if (marking->IsReadyToOverApproximateWeakClosure()) { |