Automated rollback of commit f309ad3be36363070e87eef0ee04b12f4956d601.

*** Reason for rollback ***

Fixed duplicate derived inputs bug. Test is in diffbase.

RELNOTES[INC]: If the same artifact is generated by two distinct but identical actions, and a downstream action has both those actions' outputs in its inputs, the artifact will now appear twice in the downstream action's inputs. If this causes problems in Skylark actions, you can use the uniquify=True argument in Args.add_args.

PiperOrigin-RevId: 205863806

1 files changed, 3 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java
index a1358c53fe..9a7d7a6aac 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionFunction.java
@@ -19,7 +19,6 @@ import com.google.common.collect.Multimaps;
 import com.google.devtools.build.lib.actions.ActionLookupData;
 import com.google.devtools.build.lib.actions.ActionLookupValue;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.ArtifactSkyKey;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.TopLevelArtifactContext;
 import com.google.devtools.build.lib.analysis.test.TestProvider;
@@ -67,10 +66,9 @@ public final class TestCompletionFunction implements SkyFunction {
         }
       }
     } else {
-      Multimap<ActionLookupValue.ActionLookupKey, ArtifactSkyKey> keyToArtifactMap =
+      Multimap<ActionLookupValue.ActionLookupKey, Artifact> keyToArtifactMap =
           Multimaps.index(
-              ArtifactSkyKey.mandatoryKeys(TestProvider.getTestStatusArtifacts(ct)),
-              (val) -> ArtifactFunction.getActionLookupKey(val.getArtifact()));
+              TestProvider.getTestStatusArtifacts(ct), ArtifactFunction::getActionLookupKey);
       Map<SkyKey, SkyValue> actionLookupValues = env.getValues(keyToArtifactMap.keySet());
       if (env.valuesMissing()) {
         return null;
@@ -82,7 +80,7 @@ public final class TestCompletionFunction implements SkyFunction {
               .map(
                   entry ->
                       getActionLookupData(
-                          entry.getValue().getArtifact(),
+                          entry.getValue(),
                           entry.getKey(),
                           (ActionLookupValue) actionLookupValues.get(entry.getKey())))
               .distinct()