Remove ConfiguredTarget from TargetCompletionValue, since it is no longer needed: we can get the ConfiguredTargetKey directly from the TargetCompletionKey. Since that was the only use of the actual value in EvaluationProgressReceiver#evaluated, remove it, instead just provide a boolean enum that gives whether or not evaluation succeeded.

PiperOrigin-RevId: 199178047

1 files changed, 31 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/skyframe/EvaluationProgressReceiver.java b/src/main/java/com/google/devtools/build/skyframe/EvaluationProgressReceiver.java
index 2844ec4f45..d93812b139 100644
--- a/src/main/java/com/google/devtools/build/skyframe/EvaluationProgressReceiver.java
+++ b/src/main/java/com/google/devtools/build/skyframe/EvaluationProgressReceiver.java
@@ -13,8 +13,8 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import com.google.common.base.Supplier;
 import com.google.devtools.build.lib.concurrent.ThreadSafety;
+import java.util.function.Supplier;
 
 /** Receiver for various stages of the lifetime of a skyframe node evaluation. */
 @ThreadSafety.ThreadSafe
@@ -29,6 +29,26 @@ public interface EvaluationProgressReceiver {
     CLEAN,
   }
 
+  /** Whether or not evaluation of this node succeeded. */
+  enum EvaluationSuccessState {
+    SUCCESS(true),
+    FAILURE(false);
+
+    EvaluationSuccessState(boolean succeeded) {
+      this.succeeded = succeeded;
+    }
+
+    private final boolean succeeded;
+
+    public boolean succeeded() {
+      return succeeded;
+    }
+
+    public Supplier<EvaluationSuccessState> supplier() {
+      return () -> this;
+    }
+  }
+
   /**
    * New state of the value entry after invalidation.
    */
@@ -97,10 +117,13 @@ public interface EvaluationProgressReceiver {
    *
    * <p>{@code state} indicates the new state of the node.
    *
-   * <p>If the value builder threw an error when building this node, then
-   * {@code valueSupplier.get()} evaluates to null.
+   * <p>If the value builder threw an error when building this node, then {@code
+   * valueSupplier.get()} evaluates to null.
    */
-  void evaluated(SkyKey skyKey, Supplier<SkyValue> valueSupplier, EvaluationState state);
+  void evaluated(
+      SkyKey skyKey,
+      Supplier<EvaluationSuccessState> evaluationSuccessState,
+      EvaluationState state);
 
   /** An {@link EvaluationProgressReceiver} that does nothing. */
   class NullEvaluationProgressReceiver implements EvaluationProgressReceiver {
@@ -121,7 +144,9 @@ public interface EvaluationProgressReceiver {
     }
 
     @Override
-    public void evaluated(SkyKey skyKey, Supplier<SkyValue> valueSupplier, EvaluationState state) {
-    }
+    public void evaluated(
+        SkyKey skyKey,
+        Supplier<EvaluationSuccessState> evaluationSuccessState,
+        EvaluationState state) {}
   }
 }