Remove CppCompileAction.optionalSourceFile

It's unused.

RELNOTES: NONE.
PiperOrigin-RevId: 198316668

3 files changed, 0 insertions, 30 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
index 24a9fd9039..b8474bfaaa 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -158,7 +158,6 @@ public class CppCompileAction extends AbstractAction
 
   protected final Artifact outputFile;
   private final Artifact sourceFile;
-  private final Artifact optionalSourceFile;
   private final NestedSet<Artifact> mandatoryInputs;
   private final Iterable<Artifact> inputsForInvalidation;
 
@@ -247,7 +246,6 @@ public class CppCompileAction extends AbstractAction
    * @param gcnoFile the coverage notes that are written in coverage mode, can be null
    * @param dwoFile the .dwo output file where debug information is stored for Fission builds (null
    *     if Fission mode is disabled)
-   * @param optionalSourceFile an additional optional source file (null if unneeded)
    * @param ccCompilationContext the {@code CcCompilationContext}
    * @param coptsFilter regular expression to remove options from {@code copts}
    * @param lipoScannables List of artifacts to include-scan when this action is a lipo action
@@ -279,7 +277,6 @@ public class CppCompileAction extends AbstractAction
       @Nullable Artifact gcnoFile,
       @Nullable Artifact dwoFile,
       @Nullable Artifact ltoIndexingFile,
-      Artifact optionalSourceFile,
       ActionEnvironment env,
       CcCompilationContext ccCompilationContext,
       CoptsFilter coptsFilter,
@@ -303,7 +300,6 @@ public class CppCompileAction extends AbstractAction
         env,
         Preconditions.checkNotNull(outputFile),
         sourceFile,
-        optionalSourceFile,
         // We do not need to include the middleman artifact since it is a generated
         // artifact and will definitely exist prior to this action execution.
         mandatoryInputs,
@@ -352,7 +348,6 @@ public class CppCompileAction extends AbstractAction
       ActionEnvironment env,
       Artifact outputFile,
       Artifact sourceFile,
-      Artifact optionalSourceFile,
       NestedSet<Artifact> mandatoryInputs,
       Iterable<Artifact> inputsForInvalidation,
       NestedSet<Artifact> prunableInputs,
@@ -384,7 +379,6 @@ public class CppCompileAction extends AbstractAction
     super(owner, inputs, outputs, env);
     this.outputFile = outputFile;
     this.sourceFile = sourceFile;
-    this.optionalSourceFile = optionalSourceFile;
     this.mandatoryInputs = mandatoryInputs;
     this.inputsForInvalidation = inputsForInvalidation;
     this.prunableInputs = prunableInputs;
@@ -867,9 +861,6 @@ public class CppCompileAction extends AbstractAction
       allowedIncludes.add(input);
     }
 
-    if (optionalSourceFile != null) {
-      allowedIncludes.add(optionalSourceFile);
-    }
     Iterable<PathFragment> ignoreDirs =
         isStrictSystemIncludes
             ? getBuiltInIncludeDirectories()
@@ -1013,9 +1004,6 @@ public class CppCompileAction extends AbstractAction
     Profiler.instance().startTask(ProfilerTask.ACTION_UPDATE, describe());
     try {
       inputs.addTransitive(mandatoryInputs);
-      if (optionalSourceFile != null) {
-        inputs.add(optionalSourceFile);
-      }
       inputs.addAll(inputsForInvalidation);
       inputs.addTransitive(discoveredInputs);
       updateInputs(inputs.build());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
index ba84554a0d..877333bf47 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
@@ -58,7 +58,6 @@ public class CppCompileActionBuilder {
   private CcToolchainVariables variables = CcToolchainVariables.EMPTY;
   private Artifact sourceFile;
   private final NestedSetBuilder<Artifact> mandatoryInputsBuilder;
-  private Artifact optionalSourceFile;
   private Artifact outputFile;
   private Artifact dwoFile;
   private Artifact ltoIndexingFile;
@@ -142,7 +141,6 @@ public class CppCompileActionBuilder {
     this.inputsForInvalidation = other.inputsForInvalidation;
     this.additionalIncludeScanningRoots =
         new ImmutableList.Builder<Artifact>().addAll(other.additionalIncludeScanningRoots.build());
-    this.optionalSourceFile = other.optionalSourceFile;
     this.outputFile = other.outputFile;
     this.dwoFile = other.dwoFile;
     this.ltoIndexingFile = other.ltoIndexingFile;
@@ -410,7 +408,6 @@ public class CppCompileActionBuilder {
               gcnoFile,
               dwoFile,
               ltoIndexingFile,
-              optionalSourceFile,
               env,
               ccCompilationContext,
               coptsFilter,
@@ -463,9 +460,6 @@ public class CppCompileActionBuilder {
    */
   NestedSet<Artifact> buildAllInputs(NestedSet<Artifact> mandatoryInputs) {
     NestedSetBuilder<Artifact> builder = NestedSetBuilder.stableOrder();
-    if (optionalSourceFile != null) {
-      builder.add(optionalSourceFile);
-    }
     builder.addTransitive(mandatoryInputs);
     builder.addAll(inputsForInvalidation);
     return builder.build();
@@ -559,17 +553,6 @@ public class CppCompileActionBuilder {
     return this;
   }
 
-  /**
-   * Set an optional source file (usually with metadata of the main source file). The optional
-   * source file can only be set once, whether via this method or through the constructor
-   * {@link #CppCompileActionBuilder(CppCompileActionBuilder)}.
-   */
-  public CppCompileActionBuilder addOptionalSourceFile(Artifact artifact) {
-    Preconditions.checkState(optionalSourceFile == null, "%s %s", optionalSourceFile, artifact);
-    optionalSourceFile = artifact;
-    return this;
-  }
-
   public CppCompileActionBuilder addMandatoryInputs(Iterable<Artifact> artifacts) {
     mandatoryInputsBuilder.addAll(artifacts);
     return this;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
index 3d49b0596a..78fc2130a6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
@@ -104,7 +104,6 @@ public class FakeCppCompileAction extends CppCompileAction {
         /* gcnoFile=*/ null,
         /* dwoFile=*/ null,
         /* ltoIndexingFile=*/ null,
-        /* optionalSourceFile=*/ null,
         env,
         // We only allow inclusion of header files explicitly declared in
         // "srcs", so we only use declaredIncludeSrcs, not declaredIncludeDirs.