Index: src/heap/incremental-marking.cc |
diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc |
index 95f522bd991fe83fadb9baa8445fd7768b736f6f..8b007be81b16ea05927e90ee2a29c87ab5b2ef4c 100644 |
--- a/src/heap/incremental-marking.cc |
+++ b/src/heap/incremental-marking.cc |
@@ -467,7 +467,7 @@ static void PatchIncrementalMarkingRecordWriteStubs( |
} |
-void IncrementalMarking::Start() { |
+void IncrementalMarking::Start(int flags_for_mark_compact_collector) { |
Hannes Payer (out of office)
2015/05/21 17:10:12
mark_compact_flags
ulan
2015/05/21 17:12:52
Done.
|
if (FLAG_trace_incremental_marking) { |
PrintF("[IncrementalMarking] Start\n"); |
} |
@@ -482,7 +482,9 @@ void IncrementalMarking::Start() { |
was_activated_ = true; |
if (!heap_->mark_compact_collector()->sweeping_in_progress()) { |
+ heap_->mark_compact_collector()->SetFlags(flags_for_mark_compact_collector); |
StartMarking(); |
+ heap_->mark_compact_collector()->SetFlags(Heap::kNoGCFlags); |
} else { |
if (FLAG_trace_incremental_marking) { |
PrintF("[IncrementalMarking] Start sweeping.\n"); |