Ensure that gathering the info for an extra action can rely on the action

being executed if the action requires input discovery. Input discovery might
actually change the action's command line, which in turn can become part of the
file being written.

RELNOTES: None.
PiperOrigin-RevId: 205207109

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java
index 4b2ef4bacb..9b9e976db9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraActionInfoFileWriteAction.java
@@ -28,7 +28,6 @@ import com.google.devtools.build.lib.analysis.actions.ProtoDeterministicWriter;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.util.Fingerprint;
-import java.io.IOException;
 
 /**
  * Requests extra action info from shadowed action and writes it, in protocol buffer format, to an
@@ -43,14 +42,18 @@ public final class ExtraActionInfoFileWriteAction extends AbstractFileWriteActio
   private final Action shadowedAction;
 
   ExtraActionInfoFileWriteAction(ActionOwner owner, Artifact primaryOutput, Action shadowedAction) {
-    super(owner, ImmutableList.<Artifact>of(), primaryOutput, false);
+    super(
+        owner,
+        shadowedAction.discoversInputs() ? shadowedAction.getOutputs() : ImmutableList.of(),
+        primaryOutput,
+        /*makeExecutable=*/ false);
 
     this.shadowedAction = Preconditions.checkNotNull(shadowedAction, primaryOutput);
   }
 
   @Override
   public DeterministicWriter newDeterministicWriter(ActionExecutionContext ctx)
-      throws IOException, InterruptedException, ExecException {
+      throws ExecException {
     try {
       return new ProtoDeterministicWriter(
           shadowedAction.getExtraActionInfo(ctx.getActionKeyContext()).build());