diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc index b3609e4adcf..749fa5ef549 100644 --- a/src/heap/incremental-marking.cc +++ b/src/heap/incremental-marking.cc @@ -468,7 +468,7 @@ static void PatchIncrementalMarkingRecordWriteStubs( } -void IncrementalMarking::Start() { +void IncrementalMarking::Start(CompactionFlag flag) { if (FLAG_trace_incremental_marking) { PrintF("[IncrementalMarking] Start\n"); } @@ -483,7 +483,7 @@ void IncrementalMarking::Start() { was_activated_ = true; if (!heap_->mark_compact_collector()->sweeping_in_progress()) { - StartMarking(); + StartMarking(flag); } else { if (FLAG_trace_incremental_marking) { PrintF("[IncrementalMarking] Start sweeping.\n"); @@ -495,12 +495,12 @@ void IncrementalMarking::Start() { } -void IncrementalMarking::StartMarking() { +void IncrementalMarking::StartMarking(CompactionFlag flag) { if (FLAG_trace_incremental_marking) { PrintF("[IncrementalMarking] Start marking\n"); } - is_compacting_ = !FLAG_never_compact && + is_compacting_ = !FLAG_never_compact && (flag == ALLOW_COMPACTION) && heap_->mark_compact_collector()->StartCompaction( MarkCompactCollector::INCREMENTAL_COMPACTION); @@ -834,7 +834,9 @@ void IncrementalMarking::Epilogue() { void IncrementalMarking::OldSpaceStep(intptr_t allocated) { if (IsStopped() && ShouldActivate()) { - Start(); + // TODO(hpayer): Let's play safe for now, but compaction should be + // in principle possible. + Start(PREVENT_COMPACTION); } else { Step(allocated * kFastMarking / kInitialMarkingSpeed, GC_VIA_STACK_GUARD); } @@ -963,7 +965,7 @@ intptr_t IncrementalMarking::Step(intptr_t allocated_bytes, } if (!heap_->mark_compact_collector()->sweeping_in_progress()) { bytes_scanned_ = 0; - StartMarking(); + StartMarking(PREVENT_COMPACTION); } } else if (state_ == MARKING) { bytes_processed = ProcessMarkingDeque(bytes_to_process); diff --git a/src/heap/incremental-marking.h b/src/heap/incremental-marking.h index 6a6f8c4abb5..7d41cfef415 100644 --- a/src/heap/incremental-marking.h +++ b/src/heap/incremental-marking.h @@ -67,7 +67,9 @@ class IncrementalMarking { bool WasActivated(); - void Start(); + enum CompactionFlag { ALLOW_COMPACTION, PREVENT_COMPACTION }; + + void Start(CompactionFlag flag = ALLOW_COMPACTION); void Stop(); @@ -206,7 +208,7 @@ class IncrementalMarking { void ResetStepCounters(); - void StartMarking(); + void StartMarking(CompactionFlag flag); void ActivateIncrementalWriteBarrier(PagedSpace* space); static void ActivateIncrementalWriteBarrier(NewSpace* space);