Fail gracefully on conflicting actions generated by an aspect. These can come from Skylark, so we shouldn't crash. As a safety measure, subclasses of ActionLookupValue are now responsible for detecting action conflicts themselves.

PiperOrigin-RevId: 187095271

1 files changed, 3 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java
index aa35490f10..edb9226a11 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CoverageReportValue.java
@@ -14,10 +14,8 @@
 
 package com.google.devtools.build.lib.skyframe;
 
-import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
-import com.google.devtools.build.lib.actions.ActionKeyContext;
 import com.google.devtools.build.lib.actions.ActionLookupValue;
+import com.google.devtools.build.lib.actions.Actions.GeneratingActions;
 import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
@@ -30,11 +28,8 @@ public class CoverageReportValue extends ActionLookupValue {
   // There should only ever be one CoverageReportValue value in the graph.
   public static final CoverageReportKey COVERAGE_REPORT_KEY = CoverageReportKey.INSTANCE;
 
-  CoverageReportValue(
-      ActionKeyContext actionKeyContext,
-      ImmutableList<ActionAnalysisMetadata> coverageReportActions,
-      boolean removeActionsAfterEvaluation) {
-    super(actionKeyContext, coverageReportActions, removeActionsAfterEvaluation);
+  CoverageReportValue(GeneratingActions generatingActions, boolean removeActionsAfterEvaluation) {
+    super(generatingActions, removeActionsAfterEvaluation);
   }
 
   @AutoCodec(strategy = AutoCodec.Strategy.SINGLETON)