Index: src/heap/mark-compact.cc |
diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc |
index a1736e9728a13ef05dff6e0c7da218d26cf271ca..99eb88c38971c71c1e809fef6041d976c9c25804 100644 |
--- a/src/heap/mark-compact.cc |
+++ b/src/heap/mark-compact.cc |
@@ -860,6 +860,12 @@ void MarkCompactCollector::Prepare() { |
was_marked_incrementally_ = false; |
} |
+ if (!was_marked_incrementally_) { |
+ if (heap_->UsingEmbedderHeapTracer()) { |
+ heap_->mark_compact_collector()->embedder_heap_tracer()->TracePrologue(); |
Michael Lippautz
2016/06/09 14:18:13
Since we might abort incremental marking (just abo
|
+ } |
+ } |
+ |
// Don't start compaction if we are in the middle of incremental |
// marking cycle. We did not collect any slots. |
if (!FLAG_never_compact && !was_marked_incrementally_) { |
@@ -2320,10 +2326,6 @@ void MarkCompactCollector::MarkLiveObjects() { |
{ |
TRACE_GC(heap()->tracer(), |
GCTracer::Scope::MC_MARK_WEAK_CLOSURE_EPHEMERAL); |
- if (UsingEmbedderHeapTracer()) { |
- embedder_heap_tracer()->TracePrologue(); |
- ProcessMarkingDeque(); |
- } |
ProcessEphemeralMarking(&root_visitor, false); |
} |