Remove unused ExtraActionInfoSupplier from SpawnAction.

It's always null. Extra actions were deprecated in favor of aspects, which may explain the obsolete field. PiperOrigin-RevId: 525145135 Change-Id: Id1924b40eb003fa4e617b7aa6bd8388341a5938c
fweikert · May 25, 2023 · 5541146 · 5541146
1 parent 248dbac
commit 5541146
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 34 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -99,11 +99,6 @@
 /** An Action representing an arbitrary subprocess to be forked and exec'd. */
 public class SpawnAction extends AbstractAction implements CommandAction {
 
-  /** Sets extensions on {@link ExtraActionInfo}. */
-  public interface ExtraActionInfoSupplier {
-    void extend(ExtraActionInfo.Builder builder);
-  }
-
   private static final String GUID = "ebd6fce3-093e-45ee-adb6-bf513b602f0d";
 
   private static final Interner<ImmutableSortedMap<String, String>> executionInfoInterner =
@@ -117,8 +112,6 @@ public interface ExtraActionInfoSupplier {
 
   private final ResourceSetOrBuilder resourceSetOrBuilder;
   private final ImmutableMap<String, String> executionInfo;
-
-  private final ExtraActionInfoSupplier extraActionInfoSupplier;
   private final Consumer<Pair<ActionExecutionContext, List<SpawnResult>>> resultConsumer;
   private final boolean stripOutputPaths;
 
@@ -165,7 +158,6 @@ public SpawnAction(
         EmptyRunfilesSupplier.INSTANCE,
         mnemonic,
         null,
-        null,
         /* stripOutputPaths= */ false);
   }
 
@@ -203,7 +195,6 @@ public SpawnAction(
       CharSequence progressMessage,
       RunfilesSupplier runfilesSupplier,
       String mnemonic,
-      ExtraActionInfoSupplier extraActionInfoSupplier,
       Consumer<Pair<ActionExecutionContext, List<SpawnResult>>> resultConsumer,
       boolean stripOutputPaths) {
     super(owner, tools, inputs, runfilesSupplier, outputs, env);
@@ -216,7 +207,6 @@ public SpawnAction(
     this.commandLineLimits = commandLineLimits;
     this.progressMessage = progressMessage;
     this.mnemonic = mnemonic;
-    this.extraActionInfoSupplier = extraActionInfoSupplier;
     this.resultConsumer = resultConsumer;
     this.stripOutputPaths = stripOutputPaths;
   }
@@ -485,15 +475,8 @@ protected String getRawProgressMessage() {
   @Override
   public ExtraActionInfo.Builder getExtraActionInfo(ActionKeyContext actionKeyContext)
       throws CommandLineExpansionException, InterruptedException {
-    ExtraActionInfo.Builder builder = super.getExtraActionInfo(actionKeyContext);
-    if (extraActionInfoSupplier == null) {
-      SpawnInfo spawnInfo = getExtraActionSpawnInfo();
-      return builder
-          .setExtension(SpawnInfo.spawnInfo, spawnInfo);
-    } else {
-      extraActionInfoSupplier.extend(builder);
-      return builder;
-    }
+    return super.getExtraActionInfo(actionKeyContext)
+        .setExtension(SpawnInfo.spawnInfo, getExtraActionSpawnInfo());
   }
 
   /**
@@ -643,7 +626,6 @@ public static class Builder {
 
     private CharSequence progressMessage;
     private String mnemonic = "Unknown";
-    ExtraActionInfoSupplier extraActionInfoSupplier = null;
     private boolean disableSandboxing = false;
     private String execGroup = DEFAULT_EXEC_GROUP_NAME;
 
@@ -811,7 +793,6 @@ protected SpawnAction createSpawnAction(
           progressMessage,
           runfilesSupplier,
           mnemonic,
-          extraActionInfoSupplier,
           resultConsumer,
           stripOutputPaths);
     }
@@ -1333,12 +1314,6 @@ public Builder stripOutputPaths(boolean stripPaths) {
       return this;
     }
 
-    @CanIgnoreReturnValue
-    public Builder setExtraActionInfo(ExtraActionInfoSupplier extraActionInfoSupplier) {
-      this.extraActionInfoSupplier = extraActionInfoSupplier;
-      return this;
-    }
-
     @CanIgnoreReturnValue
     public Builder disableSandboxing() {
       this.disableSandboxing = true;

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/StarlarkAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/StarlarkAction.java
@@ -130,8 +130,7 @@ private StarlarkAction(
         progressMessage,
         runfilesSupplier,
         mnemonic,
-        /* extraActionInfoSupplier */ null,
-        /* resultConsumer */ null,
+        /* resultConsumer= */ null,
         stripOutputPaths);
 
     this.allStarlarkActionInputs = inputs;

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java b/src/main/java/com/google/devtools/build/lib/analysis/extra/ExtraAction.java
@@ -83,7 +83,6 @@ public final class ExtraAction extends SpawnAction {
         CompositeRunfilesSupplier.of(shadowedAction.getRunfilesSupplier(), runfilesSupplier),
         mnemonic,
         null,
-        null,
         /*stripOutputPaths=*/ false);
     this.shadowedAction = shadowedAction;
     this.createDummyOutput = createDummyOutput;

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java
@@ -527,7 +527,6 @@ private static final class InstallAction extends SpawnAction {
           progressMessage,
           runfilesSupplier,
           mnemonic,
-          /* extraActionInfoSupplier= */ null,
           /* resultConsumer= */ null,
           /* stripOutputPaths= */ false);
     }

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java
@@ -102,7 +102,6 @@ public LtoBackendAction(
         runfilesSupplier,
         mnemonic,
         null,
-        null,
         /*stripOutputPaths=*/ false);
     mandatoryInputs = inputs;
     Preconditions.checkState(

diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleAction.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleAction.java
@@ -63,7 +63,6 @@ public GenRuleAction(
         runfilesSupplier,
         MNEMONIC,
         null,
-        null,
         /*stripOutputPaths=*/ false);
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileActionBuilder.java
@@ -447,7 +447,6 @@ public void build(JavaToolchainProvider javaToolchain) throws InterruptedExcepti
               /* progressMessage= */ progressMessage,
               /* runfilesSupplier= */ EmptyRunfilesSupplier.INSTANCE,
               /* mnemonic= */ "Turbine",
-              /* extraActionInfoSupplier= */ null,
               /* resultConsumer= */ resultConsumer,
               /* stripOutputPaths= */ stripOutputPaths));
       return;