Commit 6928465b authored by hpayer's avatar hpayer Committed by Commit bot

Make sure we do not start incremental marking in idle notification when...

Make sure we do not start incremental marking in idle notification when incremental marking is turned off via flags.

BUG=chromium:498315
LOG=n

Review URL: https://codereview.chromium.org/1177953002

Cr-Commit-Position: refs/heads/master@{#28925}
parent 440a1c7a
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "src/flags.h"
#include "src/heap/gc-idle-time-handler.h" #include "src/heap/gc-idle-time-handler.h"
#include "src/heap/gc-tracer.h" #include "src/heap/gc-tracer.h"
#include "src/utils.h" #include "src/utils.h"
...@@ -322,8 +323,9 @@ GCIdleTimeAction GCIdleTimeHandler::Action(double idle_time_in_ms, ...@@ -322,8 +323,9 @@ GCIdleTimeAction GCIdleTimeHandler::Action(double idle_time_in_ms,
} }
} }
if (heap_state.incremental_marking_stopped && if (!FLAG_incremental_marking ||
!heap_state.can_start_incremental_marking && !reduce_memory) { (heap_state.incremental_marking_stopped &&
!heap_state.can_start_incremental_marking && !reduce_memory)) {
return NothingOrDone(); return NothingOrDone();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment