Remove optional_*_flag fields from crosstool

They are not used anyway. optional_compiler_flag will be removed once internal
migration is finished.

RELNOTES: CppRules: Remove optional_*_flag fields from CROSSTOOL, they are not
used, and could be expressed using features.
PiperOrigin-RevId: 190600731

5 files changed, 29 insertions, 59 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBuildVariables.java
index 42b5b6d4f1..00cb717f76 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBuildVariables.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBuildVariables.java
@@ -63,7 +63,7 @@ public class CcBuildVariables {
     USER_COMPILE_FLAGS("user_compile_flags"),
     /**
      * Variable for all flags coming from legacy crosstool fields, such as compiler_flag,
-     * optional_compiler_flag, cxx_flag, optional_cxx_flag.
+     * optional_compiler_flag, cxx_flag.
      */
     LEGACY_COMPILE_FLAGS("legacy_compile_flags"),
     /** Variable for flags coming from unfiltered_cxx_flag CROSSTOOL fields. */
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
index 13c9166f35..43fb642aa7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
@@ -738,47 +738,36 @@ public final class CcToolchainProvider extends ToolchainInfo {
     return toolchainInfo.getOptionalCompilerFlags();
   }
 
-  /** Returns optional compiler flags for C++ arising from the {@link CToolchain}. */
-  ImmutableList<OptionalFlag> getOptionalCxxFlags() {
-    return toolchainInfo.getOptionalCxxFlags();
-  }
-
   /** Returns linker flags for fully statically linked outputs. */
   FlagList getFullyStaticLinkFlags(CompilationMode compilationMode, LipoMode lipoMode) {
     return new FlagList(
-        configureLinkerOptions(
-            compilationMode, lipoMode, LinkingMode.FULLY_STATIC),
-        FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()),
+        configureLinkerOptions(compilationMode, lipoMode, LinkingMode.FULLY_STATIC),
+        ImmutableList.of(),
         ImmutableList.<String>of());
   }
 
   /** Returns linker flags for mostly static linked outputs. */
   FlagList getMostlyStaticLinkFlags(CompilationMode compilationMode, LipoMode lipoMode) {
     return new FlagList(
-        configureLinkerOptions(
-            compilationMode, lipoMode, LinkingMode.MOSTLY_STATIC),
-        FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()),
+        configureLinkerOptions(compilationMode, lipoMode, LinkingMode.MOSTLY_STATIC),
+        ImmutableList.of(),
         ImmutableList.<String>of());
   }
 
   /** Returns linker flags for mostly static shared linked outputs. */
   FlagList getMostlyStaticSharedLinkFlags(CompilationMode compilationMode, LipoMode lipoMode) {
     return new FlagList(
-        configureLinkerOptions(
-            compilationMode,
-            lipoMode,
-            LinkingMode.MOSTLY_STATIC_LIBRARIES),
-        FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()),
+        configureLinkerOptions(compilationMode, lipoMode, LinkingMode.MOSTLY_STATIC_LIBRARIES),
+        ImmutableList.of(),
         ImmutableList.<String>of());
   }
 
   /** Returns linker flags for artifacts that are not fully or mostly statically linked. */
   FlagList getDynamicLinkFlags(CompilationMode compilationMode, LipoMode lipoMode) {
     return new FlagList(
-        configureLinkerOptions(
-            compilationMode, lipoMode, LinkingMode.DYNAMIC),
-        FlagList.convertOptionalOptions(toolchainInfo.getOptionalLinkerFlags()),
-        ImmutableList.<String>of());
+        configureLinkerOptions(compilationMode, lipoMode, LinkingMode.DYNAMIC),
+        ImmutableList.of(),
+        ImmutableList.of());
   }
 
   ImmutableList<String> configureLinkerOptions(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index d1ca0f5ad1..a8e609824e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -282,33 +282,33 @@ public final class CppConfiguration extends BuildConfiguration.Fragment {
             ImmutableList.copyOf(cppOptions.coptList)),
         new FlagList(
             cxxOptsBuilder.build(),
-            FlagList.convertOptionalOptions(toolchain.getOptionalCxxFlagList()),
+            ImmutableList.of(),
             ImmutableList.copyOf(cppOptions.cxxoptList)),
         new FlagList(
             ImmutableList.copyOf(toolchain.getUnfilteredCxxFlagList()),
-            FlagList.convertOptionalOptions(toolchain.getOptionalUnfilteredCxxFlagList()),
-            ImmutableList.<String>of()),
+            ImmutableList.of(),
+            ImmutableList.of()),
         ImmutableList.copyOf(cppOptions.conlyoptList),
         new FlagList(
             cppToolchainInfo.configureLinkerOptions(
                 compilationMode, cppOptions.getLipoMode(), LinkingMode.FULLY_STATIC),
-            FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()),
-            ImmutableList.<String>of()),
+            ImmutableList.of(),
+            ImmutableList.of()),
         new FlagList(
             cppToolchainInfo.configureLinkerOptions(
                 compilationMode, cppOptions.getLipoMode(), LinkingMode.MOSTLY_STATIC),
-            FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()),
-            ImmutableList.<String>of()),
+            ImmutableList.of(),
+            ImmutableList.of()),
         new FlagList(
             cppToolchainInfo.configureLinkerOptions(
                 compilationMode, cppOptions.getLipoMode(), LinkingMode.MOSTLY_STATIC_LIBRARIES),
-            FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()),
-            ImmutableList.<String>of()),
+            ImmutableList.of(),
+            ImmutableList.of()),
         new FlagList(
             cppToolchainInfo.configureLinkerOptions(
                 compilationMode, cppOptions.getLipoMode(), LinkingMode.DYNAMIC),
-            FlagList.convertOptionalOptions(toolchain.getOptionalLinkerFlagList()),
-            ImmutableList.<String>of()),
+            ImmutableList.of(),
+            ImmutableList.of()),
         ImmutableList.copyOf(cppOptions.coptList),
         ImmutableList.copyOf(cppOptions.cxxoptList),
         linkoptsBuilder.build(),
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index 332ea96762..992486e230 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -298,10 +298,7 @@ public class CppHelper {
             .addAll(toolchain.getLipoCxxFlags().get(config.getLipoMode()));
 
     FlagList cxxFlags =
-        new FlagList(
-            cxxOptsBuilder.build(),
-            FlagList.convertOptionalOptions(toolchain.getOptionalCxxFlags()),
-            ImmutableList.of());
+        new FlagList(cxxOptsBuilder.build(), ImmutableList.of(), ImmutableList.of());
 
     return cxxFlags.evaluate(features);
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java
index 03a9f9d674..2b5e54c9da 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppToolchainInfo.java
@@ -96,7 +96,6 @@ public final class CppToolchainInfo {
   private final ImmutableList<String> crosstoolCompilerFlags;
   private final ImmutableList<String> crosstoolCxxFlags;
   private final ImmutableList<OptionalFlag> crosstoolOptionalCompilerFlags;
-  private final ImmutableList<OptionalFlag> crosstoolOptionalCxxFlags;
 
   private final ImmutableListMultimap<CompilationMode, String> cFlagsByCompilationMode;
   private final ImmutableListMultimap<CompilationMode, String> cxxFlagsByCompilationMode;
@@ -184,8 +183,8 @@ public final class CppToolchainInfo {
           toolchain.getHostSystemName(),
           new FlagList(
               ImmutableList.copyOf(toolchain.getDynamicLibraryLinkerFlagList()),
-              FlagList.convertOptionalOptions(toolchain.getOptionalDynamicLibraryLinkerFlagList()),
-              ImmutableList.<String>of()),
+              ImmutableList.of(),
+              ImmutableList.of()),
           ImmutableList.copyOf(toolchain.getLinkerFlagList()),
           linkOptionsFromLinkingModeBuilder.build(),
           computeLinkOptionsFromLipoMode(toolchain),
@@ -208,21 +207,18 @@ public final class CppToolchainInfo {
           ImmutableList.copyOf(toolchain.getCompilerFlagList()),
           ImmutableList.copyOf(toolchain.getCxxFlagList()),
           ImmutableList.copyOf(toolchain.getOptionalCompilerFlagList()),
-          ImmutableList.copyOf(toolchain.getOptionalCxxFlagList()),
           cFlagsBuilder.build(),
           cxxFlagsBuilder.build(),
           lipoCFlagsBuilder.build(),
           lipoCxxFlagsBuilder.build(),
           new FlagList(
               ImmutableList.copyOf(toolchain.getUnfilteredCxxFlagList()),
-              FlagList.convertOptionalOptions(toolchain.getOptionalUnfilteredCxxFlagList()),
-              ImmutableList.<String>of()),
+              ImmutableList.of(),
+              ImmutableList.of()),
           toolchain.getSupportsFission(),
           toolchain.getSupportsStartEndLib(),
           toolchain.getSupportsEmbeddedRuntimes(),
-          haveDynamicMode
-              || !toolchain.getDynamicLibraryLinkerFlagList().isEmpty()
-              || !toolchain.getOptionalDynamicLibraryLinkerFlagList().isEmpty(),
+          haveDynamicMode || !toolchain.getDynamicLibraryLinkerFlagList().isEmpty(),
           toolchain.getSupportsInterfaceSharedObjects(),
           toolchain.getSupportsGoldLinker(),
           toolchain.getNeedsPic());
@@ -265,7 +261,6 @@ public final class CppToolchainInfo {
       ImmutableList<String> crosstoolCompilerFlags,
       ImmutableList<String> crosstoolCxxFlags,
       ImmutableList<OptionalFlag> crosstoolOptionalCompilerFlags,
-      ImmutableList<OptionalFlag> crosstoolOptionalCxxFlags,
       ImmutableListMultimap<CompilationMode, String> cFlagsByCompilationMode,
       ImmutableListMultimap<CompilationMode, String> cxxFlagsByCompilationMode,
       ImmutableListMultimap<LipoMode, String> lipoCFlags,
@@ -311,7 +306,6 @@ public final class CppToolchainInfo {
     this.crosstoolCompilerFlags = crosstoolCompilerFlags;
     this.crosstoolCxxFlags = crosstoolCxxFlags;
     this.crosstoolOptionalCompilerFlags = crosstoolOptionalCompilerFlags;
-    this.crosstoolOptionalCxxFlags = crosstoolOptionalCxxFlags;
     this.cFlagsByCompilationMode = cFlagsByCompilationMode;
     this.cxxFlagsByCompilationMode = cxxFlagsByCompilationMode;
     this.lipoCFlags = lipoCFlags;
@@ -622,13 +616,6 @@ public final class CppToolchainInfo {
   }
 
   /**
-   * Returns optional flags for linking.
-   */
-  public List<OptionalFlag> getOptionalLinkerFlags() {
-    return toolchain.getOptionalLinkerFlagList();
-  }
-
-  /**
    * Returns the run time sysroot, which is where the dynamic linker and system libraries are found
    * at runtime. This is usually an absolute path. If the toolchain compiler does not support
    * sysroots, then this method returns <code>null</code>.
@@ -752,15 +739,12 @@ public final class CppToolchainInfo {
   }
 
   /** Returns optional compiler flags from this toolchain. */
+  @Deprecated
+  // TODO(b/76449614): Remove all traces of optional flag crosstool fields when g3 is migrated.
   public ImmutableList<OptionalFlag> getOptionalCompilerFlags() {
     return crosstoolOptionalCompilerFlags;
   }
 
-  /** Returns optional compiler flags for C++ from this toolchain. */
-  public ImmutableList<OptionalFlag> getOptionalCxxFlags() {
-    return crosstoolOptionalCxxFlags;
-  }
-
   /** Returns unfiltered compiler options for C++ from this toolchain. */
   public ImmutableList<String> getUnfilteredCompilerOptions(
       Iterable<String> features, @Nullable PathFragment sysroot) {