[heap] GCTracer for visiting/marking ephemerons

Bug: chromium:844008
Change-Id: Ic736bb91c13da5d52baa53cd3630978b9819f66b
Reviewed-on: https://chromium-review.googlesource.com/1097488Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Commit-Queue: Dominik Inführ <dinfuehr@google.com>
Cr-Commit-Position: refs/heads/master@{#53691}

src/heap-symbols.h

@@ -335,6 +335,8 @@
   F(MC_MARK_ROOTS)                                   \
   F(MC_MARK_WEAK_CLOSURE)                            \
   F(MC_MARK_WEAK_CLOSURE_EPHEMERON)                  \
+  F(MC_MARK_WEAK_CLOSURE_EPHEMERON_VISITING)         \
+  F(MC_MARK_WEAK_CLOSURE_EPHEMERON_MARKING)          \
   F(MC_MARK_WEAK_CLOSURE_WEAK_HANDLES)               \
   F(MC_MARK_WEAK_CLOSURE_WEAK_ROOTS)                 \
   F(MC_MARK_WEAK_CLOSURE_HARMONY)                    \

src/heap/gc-tracer.cc

@@ -698,6 +698,8 @@ void GCTracer::PrintNVP() const {
           "mark.main=%.1f "
           "mark.weak_closure=%.1f "
           "mark.weak_closure.ephemeron=%.1f "
+          "mark.weak_closure.ephemeron.visiting=%.1f "
+          "mark.weak_closure.ephemeron.marking=%.1f "
           "mark.weak_closure.weak_handles=%.1f "
           "mark.weak_closure.weak_roots=%.1f "
           "mark.weak_closure.harmony=%.1f "
@@ -792,6 +794,8 @@ void GCTracer::PrintNVP() const {
           current_.scopes[Scope::MC_MARK_MAIN],
           current_.scopes[Scope::MC_MARK_WEAK_CLOSURE],
           current_.scopes[Scope::MC_MARK_WEAK_CLOSURE_EPHEMERON],
+          current_.scopes[Scope::MC_MARK_WEAK_CLOSURE_EPHEMERON_VISITING],
+          current_.scopes[Scope::MC_MARK_WEAK_CLOSURE_EPHEMERON_MARKING],
           current_.scopes[Scope::MC_MARK_WEAK_CLOSURE_WEAK_HANDLES],
           current_.scopes[Scope::MC_MARK_WEAK_CLOSURE_WEAK_ROOTS],
           current_.scopes[Scope::MC_MARK_WEAK_CLOSURE_HARMONY],

src/heap/mark-compact.cc

@@ -1485,9 +1485,18 @@ void MarkCompactCollector::ProcessEphemeronMarking() {
           0, EmbedderHeapTracer::AdvanceTracingActions(
                  EmbedderHeapTracer::ForceCompletionAction::FORCE_COMPLETION));
     }
-    ProcessWeakCollections();
+    {
+      TRACE_GC(heap()->tracer(),
+               GCTracer::Scope::MC_MARK_WEAK_CLOSURE_EPHEMERON_VISITING);
+      ProcessWeakCollections();
+    }
     work_to_do = !marking_worklist()->IsEmpty();
-    ProcessMarkingWorklist();
+
+    {
+      TRACE_GC(heap()->tracer(),
+               GCTracer::Scope::MC_MARK_WEAK_CLOSURE_EPHEMERON_MARKING);
+      ProcessMarkingWorklist();
+    }
   }
   CHECK(marking_worklist()->IsEmpty());
   CHECK_EQ(0, heap()->local_embedder_heap_tracer()->NumberOfWrappersToTrace());