Remove FragmentOptions' addAllLabels and getAllLabels and friends.

These are now dead code - configuration dependencies are loaded by Skyframe
and do not need to be listed ahead of time - and were only ever used in
tests.

PiperOrigin-RevId: 161146721

8 files changed, 0 insertions, 149 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 4e33c0ffbe..4d718b49fb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -1181,14 +1180,6 @@ public final class BuildConfiguration implements BuildEvent {
     }
 
     @Override
-    public void addAllLabels(Multimap<String, Label> labelMap) {
-      labelMap.putAll("action_listener", actionListeners);
-      labelMap.putAll("plugins", pluginList);
-      if ((runUnder != null) && (runUnder.getLabel() != null)) {
-        labelMap.put("RunUnder", runUnder.getLabel());
-      }
-    }
-    @Override
     public Map<String, Set<Label>> getDefaultsLabels(BuildConfiguration.Options commonOptions) {
       return ImmutableMap.<String, Set<Label>>of(
           "coverage_support", ImmutableSet.of(coverageSupport),
@@ -2673,10 +2664,6 @@ public final class BuildConfiguration implements BuildEvent {
     return buildOptions;
   }
 
-  public ListMultimap<String, Label> getAllLabels() {
-    return buildOptions.getAllLabels();
-  }
-
   public String getCpu() {
     return options.cpu;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index 102a68f1ef..e1f012f25f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -15,11 +15,9 @@
 package com.google.devtools.build.lib.analysis.config;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ListMultimap;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
 import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
@@ -168,20 +166,6 @@ public final class BuildOptions implements Cloneable, Serializable {
     return fragmentOptionsMap.containsKey(optionsClass);
   }
 
-  /**
-   * Returns a multimap of all labels that were specified as options, keyed by the name to be
-   * displayed to the user if something goes wrong. This should be the set of all labels
-   * mentioned in explicit command line options that are not already covered by the
-   * tools/defaults package (see the DefaultsPackage class), and nothing else.
-   */
-  public ListMultimap<String, Label> getAllLabels() {
-    ListMultimap<String, Label> labels = ArrayListMultimap.create();
-    for (FragmentOptions optionsBase : fragmentOptionsMap.values()) {
-      optionsBase.addAllLabels(labels);
-    }
-    return labels;
-  }
-
   // It would be very convenient to use a Multimap here, but we cannot do that because we need to
   // support defaults labels that have zero elements.
   ImmutableMap<String, ImmutableSet<Label>> getDefaultsLabels() {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
index 6cdc251dfb..f3b84603e0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
@@ -16,9 +16,7 @@ package com.google.devtools.build.lib.analysis.config;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Multimap;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
 import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsBase;
@@ -34,18 +32,6 @@ import java.util.Set;
 public abstract class FragmentOptions extends OptionsBase implements Cloneable, Serializable {
 
   /**
-   * Adds all labels defined by the options to a multimap. See {@code BuildOptions.getAllLabels()}.
-   *
-   * <p>There should generally be no code duplication between this code and DefaultsPackage. Either
-   * the labels are loaded unconditionally using this method, or they are added as magic labels
-   * using the tools/defaults package, but not both.
-   *
-   * @param labelMap a mutable multimap to which the labels of this fragment should be added
-   */
-  public void addAllLabels(Multimap<String, Label> labelMap) {
-  }
-
-  /**
    * Returns the labels contributed to the defaults package by this fragment.
    *
    * <p>The set of keys returned by this function should be constant, however, the values are
@@ -116,28 +102,6 @@ public abstract class FragmentOptions extends OptionsBase implements Cloneable,
     return getDefault();
   }
 
-  protected void addOptionalLabel(Multimap<String, Label> map, String key, String value) {
-    Label label = parseOptionalLabel(value);
-    if (label != null) {
-      map.put(key, label);
-    }
-  }
-
-  private static Label parseOptionalLabel(String value) {
-    if (value != null) {
-      try {
-        return Label.parseAbsolute(value);
-      } catch (LabelSyntaxException e) {
-        // We ignore this exception here - it will cause an error message at a later time.
-        // TODO(bazel-team): We can use a Converter to check the validity of the crosstoolTop
-        // earlier.
-        return null;
-      }
-    } else {
-      return null;
-    }
-  }
-
   /**
    * Returns {@code true} if static configurations should be used with
    * {@link BuildConfiguration.Options.DynamicConfigsMode.NOTRIM_PARTIAL}.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index 2672fbad0f..2d01836204 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -17,7 +17,6 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.EmptyToNullLabelConverter;
@@ -672,15 +671,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     public boolean generateRobolectricRClass;
 
     @Override
-    public void addAllLabels(Multimap<String, Label> labelMap) {
-      if (androidCrosstoolTop != null) {
-        labelMap.put("android_crosstool_top", androidCrosstoolTop);
-      }
-
-      labelMap.put("android_sdk", sdk);
-    }
-
-    @Override
     public FragmentOptions getHost(boolean fallback) {
       Options host = (Options) super.getHost(fallback);
       host.androidCrosstoolTop = androidCrosstoolTop;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
index c9c91a2d7b..f523faf746 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
@@ -17,7 +17,6 @@ package com.google.devtools.build.lib.rules.apple;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Multimap;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.DefaultLabelConverter;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
@@ -396,14 +395,6 @@ public class AppleCommandLineOptions extends FragmentOptions {
     }
   }
 
-  @Override
-  public void addAllLabels(Multimap<String, Label> labelMap) {
-    if (getPlatform() == Platform.IOS_DEVICE) {
-      labelMap.put("default_provisioning_profile", defaultProvisioningProfile);
-    }
-    labelMap.put("xcode_version_config", xcodeVersionConfig);
-  }
-
   /**
    * Represents the Apple Bitcode mode for compilation steps.
    *
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index 888a276364..a705b3ef8d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -17,7 +17,6 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter;
 import com.google.devtools.build.lib.analysis.config.CompilationMode;
@@ -870,40 +869,6 @@ public class CppOptions extends FragmentOptions {
   }
 
   @Override
-  public void addAllLabels(Multimap<String, Label> labelMap) {
-    labelMap.put("crosstool", crosstoolTop);
-    if (hostCrosstoolTop != null) {
-      labelMap.put("crosstool", hostCrosstoolTop);
-    }
-
-    if (libcTopLabel != null) {
-      Label libcLabel = libcTopLabel;
-      if (libcLabel != null) {
-        labelMap.put("crosstool", libcLabel);
-      }
-    }
-    if (hostLibcTopLabel != null) {
-      Label libcLabel = hostLibcTopLabel;
-      if (libcLabel != null) {
-        labelMap.put("crosstool", libcLabel);
-      }
-    }
-    addOptionalLabel(labelMap, "fdo", getFdoOptimize());
-
-    if (stl != null) {
-      labelMap.put("STL", stl);
-    }
-
-    if (customMalloc != null) {
-      labelMap.put("custom_malloc", customMalloc);
-    }
-
-    if (getLipoContext() != null) {
-      labelMap.put("lipo", getLipoContext());
-    }
-  }
-
-  @Override
   public Map<String, Set<Label>> getDefaultsLabels(BuildConfiguration.Options commonOptions) {
     Set<Label> crosstoolLabels = new LinkedHashSet<>();
     crosstoolLabels.add(crosstoolTop);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index 33ba628d1f..2d52cfb10a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.java;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelMapConverter;
@@ -24,7 +23,6 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration.StrictDe
 import com.google.devtools.build.lib.analysis.config.DefaultsPackage;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaOptimizationMode;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.OneVersionEnforcementLevel;
@@ -543,17 +541,6 @@ public class JavaOptions extends FragmentOptions {
   }
 
   @Override
-  public void addAllLabels(Multimap<String, Label> labelMap) {
-    addOptionalLabel(labelMap, "jdk", javaBase);
-    addOptionalLabel(labelMap, "jdk", hostJavaBase);
-    if (javaLauncher != null) {
-      labelMap.put("java_launcher", javaLauncher);
-    }
-    labelMap.put("java_toolchain", javaToolchain);
-    labelMap.putAll("translation", getTranslationLabels());
-  }
-
-  @Override
   public Map<String, Set<Label>> getDefaultsLabels(BuildConfiguration.Options commonOptions) {
     Set<Label> jdkLabels = new LinkedHashSet<>();
     DefaultsPackage.parseAndAdd(jdkLabels, javaBase);
@@ -564,17 +551,4 @@ public class JavaOptions extends FragmentOptions {
 
     return result;
   }
-
-  private Set<Label> getTranslationLabels() {
-    Set<Label> result = new LinkedHashSet<>();
-    for (String s : translationTargets) {
-      try {
-        Label label = Label.parseAbsolute(s);
-        result.add(label);
-      } catch (LabelSyntaxException e) {
-        // We ignore this exception here - it will cause an error message at a later time.
-      }
-    }
-    return result;
-  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java
index 6c35ba171f..a1074d026d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.rules.objc;
 
-import com.google.common.collect.Multimap;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelConverter;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -87,7 +86,4 @@ public class J2ObjcCommandLineOptions extends FragmentOptions {
     help = "Whether to generate J2ObjC header map in parallel of J2ObjC transpilation."
   )
   public boolean experimentalJ2ObjcHeaderMap;
-
-  @Override
-  public void addAllLabels(Multimap<String, Label> labelMap) {}
 }