Commit c31c9ee0 authored by ulan's avatar ulan Committed by Commit bot

[heap] Fix condition for usage of concurrent marking deque.

BUG=chromium:718013

Review-Url: https://codereview.chromium.org/2862533003
Cr-Commit-Position: refs/heads/master@{#45067}
parent 133ef93a
...@@ -5505,8 +5505,12 @@ bool Heap::SetUp() { ...@@ -5505,8 +5505,12 @@ bool Heap::SetUp() {
mark_compact_collector_ = new MarkCompactCollector(this); mark_compact_collector_ = new MarkCompactCollector(this);
incremental_marking_->set_marking_deque( incremental_marking_->set_marking_deque(
mark_compact_collector_->marking_deque()); mark_compact_collector_->marking_deque());
#if V8_CONCURRENT_MARKING
concurrent_marking_ = concurrent_marking_ =
new ConcurrentMarking(this, mark_compact_collector_->marking_deque()); new ConcurrentMarking(this, mark_compact_collector_->marking_deque());
#else
concurrent_marking_ = new ConcurrentMarking(this, nullptr);
#endif
if (FLAG_minor_mc) if (FLAG_minor_mc)
minor_mark_compact_collector_ = new MinorMarkCompactCollector(this); minor_mark_compact_collector_ = new MinorMarkCompactCollector(this);
gc_idle_time_handler_ = new GCIdleTimeHandler(); gc_idle_time_handler_ = new GCIdleTimeHandler();
......
...@@ -32,7 +32,7 @@ class PageParallelJob; ...@@ -32,7 +32,7 @@ class PageParallelJob;
class RecordMigratedSlotVisitor; class RecordMigratedSlotVisitor;
class ThreadLocalTop; class ThreadLocalTop;
#ifdef V8_CONCURRENT_MARKING #if V8_CONCURRENT_MARKING
using MarkingDeque = ConcurrentMarkingDeque; using MarkingDeque = ConcurrentMarkingDeque;
#else #else
using MarkingDeque = SequentialMarkingDeque; using MarkingDeque = SequentialMarkingDeque;
......
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