Fix Postable forwarding and replay

We were previously duplicate-posting Postable events posted to the
Skyframe environment.

PiperOrigin-RevId: 162323598

1 files changed, 29 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java
index 2f585ff679..9bafd6ebf7 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java
@@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetVisitor;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
+import com.google.devtools.build.lib.events.ExtendedEventHandler.Postable;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.skyframe.MemoizingEvaluator.EmittedEventState;
 import com.google.devtools.build.skyframe.QueryableGraph.Reason;
@@ -46,6 +47,7 @@ class ParallelEvaluatorContext {
   private final ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions;
   private final ExtendedEventHandler reporter;
   private final NestedSetVisitor<TaggedEvents> replayingNestedSetEventVisitor;
+  private final NestedSetVisitor<Postable> replayingNestedSetPostableVisitor;
   private final boolean keepGoing;
   private final DirtyTrackingProgressReceiver progressReceiver;
   private final EventFilter storedEventFilter;
@@ -76,7 +78,10 @@ class ParallelEvaluatorContext {
     this.skyFunctions = skyFunctions;
     this.reporter = reporter;
     this.replayingNestedSetEventVisitor =
-        new NestedSetVisitor<>(new NestedSetEventReceiver(reporter), emittedEventState);
+        new NestedSetVisitor<>(new NestedSetEventReceiver(reporter), emittedEventState.eventState);
+    this.replayingNestedSetPostableVisitor =
+        new NestedSetVisitor<>(
+            new NestedSetPostableReceiver(reporter), emittedEventState.postableState);
     this.keepGoing = keepGoing;
     this.progressReceiver = Preconditions.checkNotNull(progressReceiver);
     this.storedEventFilter = storedEventFilter;
@@ -109,7 +114,10 @@ class ParallelEvaluatorContext {
     this.skyFunctions = skyFunctions;
     this.reporter = reporter;
     this.replayingNestedSetEventVisitor =
-        new NestedSetVisitor<>(new NestedSetEventReceiver(reporter), emittedEventState);
+        new NestedSetVisitor<>(new NestedSetEventReceiver(reporter), emittedEventState.eventState);
+    this.replayingNestedSetPostableVisitor =
+        new NestedSetVisitor<>(
+            new NestedSetPostableReceiver(reporter), emittedEventState.postableState);
     this.keepGoing = keepGoing;
     this.progressReceiver = Preconditions.checkNotNull(progressReceiver);
     this.storedEventFilter = storedEventFilter;
@@ -192,6 +200,10 @@ class ParallelEvaluatorContext {
     return replayingNestedSetEventVisitor;
   }
 
+  NestedSetVisitor<Postable> getReplayingNestedSetPostableVisitor() {
+    return replayingNestedSetPostableVisitor;
+  }
+
   ExtendedEventHandler getReporter() {
     return reporter;
   }
@@ -225,4 +237,19 @@ class ParallelEvaluatorContext {
       }
     }
   }
+
+  /** Receives the postables from the NestedSet and delegates to the reporter. */
+  private static class NestedSetPostableReceiver implements NestedSetVisitor.Receiver<Postable> {
+
+    private final ExtendedEventHandler reporter;
+
+    public NestedSetPostableReceiver(ExtendedEventHandler reporter) {
+      this.reporter = reporter;
+    }
+
+    @Override
+    public void accept(Postable post) {
+      reporter.post(post);
+    }
+  }
 }