| Index: src/incremental-marking.cc
|
| diff --git a/src/incremental-marking.cc b/src/incremental-marking.cc
|
| index 4223dde211e4030b858c6fbe87816107642ac638..1b9a28a5b7d824f193778cb94ef8f2dc550bb466 100644
|
| --- a/src/incremental-marking.cc
|
| +++ b/src/incremental-marking.cc
|
| @@ -498,12 +498,10 @@ bool IncrementalMarking::WorthActivating() {
|
| // debug tests run with incremental marking and some without.
|
| static const intptr_t kActivationThreshold = 0;
|
| #endif
|
| - // Only start incremental marking in a safe state: 1) when expose GC is
|
| - // deactivated, 2) when incremental marking is turned on, 3) when we are
|
| - // currently not in a GC, and 4) when we are currently not serializing
|
| - // or deserializing the heap.
|
| - return !FLAG_expose_gc &&
|
| - FLAG_incremental_marking &&
|
| + // Only start incremental marking in a safe state: 1) when incremental
|
| + // marking is turned on, 2) when we are currently not in a GC, and
|
| + // 3) when we are currently not serializing or deserializing the heap.
|
| + return FLAG_incremental_marking &&
|
| FLAG_incremental_marking_steps &&
|
| heap_->gc_state() == Heap::NOT_IN_GC &&
|
| !Serializer::enabled() &&
|
|
|