| Index: src/heap/heap.cc
|
| diff --git a/src/heap/heap.cc b/src/heap/heap.cc
|
| index 950d18d3ddc013e0f3f6173bd2641b4fad4aa879..2bf98a857ec56003be304d07332f6d4c04283187 100644
|
| --- a/src/heap/heap.cc
|
| +++ b/src/heap/heap.cc
|
| @@ -22,6 +22,7 @@
|
| #include "src/global-handles.h"
|
| #include "src/heap/array-buffer-tracker-inl.h"
|
| #include "src/heap/code-stats.h"
|
| +#include "src/heap/concurrent-marking.h"
|
| #include "src/heap/embedder-tracing.h"
|
| #include "src/heap/gc-idle-time-handler.h"
|
| #include "src/heap/gc-tracer.h"
|
| @@ -135,6 +136,7 @@ Heap::Heap()
|
| memory_allocator_(nullptr),
|
| store_buffer_(nullptr),
|
| incremental_marking_(nullptr),
|
| + concurrent_marking_(nullptr),
|
| gc_idle_time_handler_(nullptr),
|
| memory_reducer_(nullptr),
|
| live_object_stats_(nullptr),
|
| @@ -5500,12 +5502,12 @@ bool Heap::SetUp() {
|
| code_range_size_))
|
| return false;
|
|
|
| - // Initialize store buffer.
|
| store_buffer_ = new StoreBuffer(this);
|
|
|
| - // Initialize incremental marking.
|
| incremental_marking_ = new IncrementalMarking(this);
|
|
|
| + concurrent_marking_ = new ConcurrentMarking(this);
|
| +
|
| for (int i = 0; i <= LAST_SPACE; i++) {
|
| space_[i] = nullptr;
|
| }
|
| @@ -5690,6 +5692,9 @@ void Heap::TearDown() {
|
| delete incremental_marking_;
|
| incremental_marking_ = nullptr;
|
|
|
| + delete concurrent_marking_;
|
| + concurrent_marking_ = nullptr;
|
| +
|
| delete gc_idle_time_handler_;
|
| gc_idle_time_handler_ = nullptr;
|
|
|
|
|