Commit 5e724050 authored by Ulan Degenbaev's avatar Ulan Degenbaev Committed by Commit Bot

[heap] Replace marking deque with marking worklist.

Change-Id: Id73c2c3a8b19c3e398d7de760dffe95e0e8b49a4
Reviewed-on: https://chromium-review.googlesource.com/566836Reviewed-by: 's avatarMichael Lippautz <mlippautz@chromium.org>
Reviewed-by: 's avatarUlan Degenbaev <ulan@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46583}
parent 97f5e1fa
...@@ -390,7 +390,6 @@ class MinorMarkCompactCollector final : public MarkCompactCollectorBase { ...@@ -390,7 +390,6 @@ class MinorMarkCompactCollector final : public MarkCompactCollectorBase {
// Collector for young and old generation. // Collector for young and old generation.
class MarkCompactCollector final : public MarkCompactCollectorBase { class MarkCompactCollector final : public MarkCompactCollectorBase {
public: public:
#ifdef V8_CONCURRENT_MARKING
// Wrapper for the shared and bailout worklists. // Wrapper for the shared and bailout worklists.
class MarkingWorklist { class MarkingWorklist {
public: public:
...@@ -408,7 +407,9 @@ class MarkCompactCollector final : public MarkCompactCollectorBase { ...@@ -408,7 +407,9 @@ class MarkCompactCollector final : public MarkCompactCollectorBase {
HeapObject* Pop() { HeapObject* Pop() {
HeapObject* result; HeapObject* result;
#ifdef V8_CONCURRENT_MARKING
if (bailout_.Pop(kMainThread, &result)) return result; if (bailout_.Pop(kMainThread, &result)) return result;
#endif
if (shared_.Pop(kMainThread, &result)) return result; if (shared_.Pop(kMainThread, &result)) return result;
return nullptr; return nullptr;
} }
...@@ -458,9 +459,6 @@ class MarkCompactCollector final : public MarkCompactCollectorBase { ...@@ -458,9 +459,6 @@ class MarkCompactCollector final : public MarkCompactCollectorBase {
ConcurrentMarkingWorklist shared_; ConcurrentMarkingWorklist shared_;
ConcurrentMarkingWorklist bailout_; ConcurrentMarkingWorklist bailout_;
}; };
#else
using MarkingWorklist = SequentialMarkingDeque;
#endif
class RootMarkingVisitor; class RootMarkingVisitor;
......
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