Rename LateBoundLabel#getDefault(Rule, AttributeMap, T) to #resolve().

Its old name was confusing because resolve() and getDefault() do radically different things: getDefault() returns a good enough lie for when BuildConfiguration is not available, and resolve() resolves the dependency when we do have a BuildConfiguration.

--
MOS_MIGRATED_REVID=120212630

11 files changed, 37 insertions, 37 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index 2f38f44f80..32307a5e70 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -81,7 +81,7 @@ public class BaseRuleClasses {
   static final LateBoundLabelList<BuildConfiguration> ACTION_LISTENER =
       new LateBoundLabelList<BuildConfiguration>() {
     @Override
-    public List<Label> getDefault(Rule rule, AttributeMap attributes,
+    public List<Label> resolve(Rule rule, AttributeMap attributes,
         BuildConfiguration configuration) {
       // action_listeners are special rules; they tell the build system to add extra_actions to
       // existing rules. As such they need an edge to every ConfiguredTarget with the limitation
@@ -94,7 +94,7 @@ public class BaseRuleClasses {
   private static final LateBoundLabelList<BuildConfiguration> COVERAGE_SUPPORT =
       new LateBoundLabelList<BuildConfiguration>(ImmutableList.of(COVERAGE_SUPPORT_LABEL)) {
         @Override
-        public List<Label> getDefault(Rule rule,  AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.isCodeCoverageEnabled()
               ? ImmutableList.copyOf(configuration.getCoverageLabels())
@@ -105,7 +105,7 @@ public class BaseRuleClasses {
   private static final LateBoundLabelList<BuildConfiguration> GCOV =
       new LateBoundLabelList<BuildConfiguration>(ImmutableList.of(COVERAGE_SUPPORT_LABEL)) {
         @Override
-        public List<Label> getDefault(Rule rule,  AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.isCodeCoverageEnabled()
               ? ImmutableList.copyOf(configuration.getGcovLabels())
@@ -116,7 +116,7 @@ public class BaseRuleClasses {
   private static final LateBoundLabelList<BuildConfiguration> COVERAGE_REPORT_GENERATOR =
       new LateBoundLabelList<BuildConfiguration>(ImmutableList.of(COVERAGE_SUPPORT_LABEL)) {
         @Override
-        public List<Label> getDefault(Rule rule,  AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.isCodeCoverageEnabled()
               ? ImmutableList.copyOf(configuration.getCoverageReportGeneratorLabels())
@@ -130,7 +130,7 @@ public class BaseRuleClasses {
   private static final LateBoundLabel<BuildConfiguration> RUN_UNDER =
       new LateBoundLabel<BuildConfiguration>() {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           RunUnder runUnder = configuration.getRunUnder();
           return runUnder == null ? null : runUnder.getLabel();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
index 02f8cd4e2c..a74094e124 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
@@ -381,7 +381,7 @@ public abstract class DependencyResolver {
 
         // TODO(bazel-team): We should check if the implementation tries to access an undeclared
         // fragment.
-        Object actualValue = lateBoundDefault.getDefault(rule, attributeMap, actualConfig);
+        Object actualValue = lateBoundDefault.resolve(rule, attributeMap, actualConfig);
         if (EvalUtils.isNullOrNone(actualValue)) {
           continue;
         }
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
index 574932efa0..85ebad3619 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
@@ -162,7 +162,7 @@ public class BazelCppRuleClasses {
   public static final LateBoundLabel<BuildConfiguration> CC_TOOLCHAIN =
       new LateBoundLabel<BuildConfiguration>(CROSSTOOL_LABEL) {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(CppConfiguration.class).getCcToolchainRuleLabel();
         }
@@ -171,7 +171,7 @@ public class BazelCppRuleClasses {
   public static final LateBoundLabel<BuildConfiguration> DEFAULT_MALLOC =
       new LateBoundLabel<BuildConfiguration>() {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(CppConfiguration.class).customMalloc();
         }
@@ -180,7 +180,7 @@ public class BazelCppRuleClasses {
   public static final LateBoundLabel<BuildConfiguration> STL =
       new LateBoundLabel<BuildConfiguration>() {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return getStl(rule, configuration);
         }
@@ -192,7 +192,7 @@ public class BazelCppRuleClasses {
   public static final LateBoundLabel<BuildConfiguration> LIPO_CONTEXT_COLLECTOR =
       new LateBoundLabel<BuildConfiguration>() {
     @Override
-    public Label getDefault(Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
+    public Label resolve(Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
       // This attribute connects a target to the LIPO context target configured with the
       // lipo input collector configuration.
       CppConfiguration cppConfiguration = configuration.getFragment(CppConfiguration.class);
@@ -680,7 +680,7 @@ public class BazelCppRuleClasses {
   private static final LateBoundLabel<BuildConfiguration> LIPO_CONTEXT =
       new LateBoundLabel<BuildConfiguration>() {
     @Override
-    public Label getDefault(Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
+    public Label resolve(Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
       Label result = configuration.getFragment(CppConfiguration.class).getLipoContextLabel();
       return (rule == null || rule.getLabel().equals(result)) ? null : result;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index f865e99799..cf4d210aef 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -981,7 +981,7 @@ public final class Attribute implements Comparable<Attribute> {
      * @param attributes interface for retrieving the values of the rule's other attributes
      * @param o the configuration to evaluate with
      */
-    Object getDefault(Rule rule, AttributeMap attributes, T o)
+    Object resolve(Rule rule, AttributeMap attributes, T o)
         throws EvalException, InterruptedException;
   }
 
@@ -1035,7 +1035,7 @@ public final class Attribute implements Comparable<Attribute> {
     }
 
     @Override
-    public abstract Label getDefault(Rule rule, AttributeMap attributes, T configuration);
+    public abstract Label resolve(Rule rule, AttributeMap attributes, T configuration);
   }
 
   /**
@@ -1069,7 +1069,7 @@ public final class Attribute implements Comparable<Attribute> {
     }
 
     @Override
-    public abstract List<Label> getDefault(Rule rule, AttributeMap attributes, T configuration);
+    public abstract List<Label> resolve(Rule rule, AttributeMap attributes, T configuration);
   }
 
   /**
@@ -1099,7 +1099,7 @@ public final class Attribute implements Comparable<Attribute> {
     }
 
     @Override
-    public Object getDefault(Rule rule, AttributeMap attributes, Object o)
+    public Object resolve(Rule rule, AttributeMap attributes, Object o)
         throws EvalException, InterruptedException {
       Map<String, Object> attrValues = new HashMap<>();
       for (Attribute attr : rule.getAttributes()) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
index 80dcba4c87..a5f3d646fe 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
@@ -117,7 +117,7 @@ public class SkylarkRuleClassFunctions {
   private static final LateBoundLabel<BuildConfiguration> RUN_UNDER =
       new LateBoundLabel<BuildConfiguration>() {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           RunUnder runUnder = configuration.getRunUnder();
           return runUnder == null ? null : runUnder.getLabel();
@@ -130,7 +130,7 @@ public class SkylarkRuleClassFunctions {
   private static final LateBoundLabelList<BuildConfiguration> GCOV =
       new LateBoundLabelList<BuildConfiguration>(ImmutableList.of(COVERAGE_SUPPORT_LABEL)) {
         @Override
-        public List<Label> getDefault(Rule rule, AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.isCodeCoverageEnabled()
               ? ImmutableList.copyOf(configuration.getGcovLabels())
@@ -141,7 +141,7 @@ public class SkylarkRuleClassFunctions {
   private static final LateBoundLabelList<BuildConfiguration> COVERAGE_REPORT_GENERATOR =
       new LateBoundLabelList<BuildConfiguration>(ImmutableList.of(COVERAGE_SUPPORT_LABEL)) {
         @Override
-        public List<Label> getDefault(Rule rule, AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.isCodeCoverageEnabled()
               ? ImmutableList.copyOf(configuration.getCoverageReportGeneratorLabels())
@@ -152,7 +152,7 @@ public class SkylarkRuleClassFunctions {
   private static final LateBoundLabelList<BuildConfiguration> COVERAGE_SUPPORT =
       new LateBoundLabelList<BuildConfiguration>(ImmutableList.of(COVERAGE_SUPPORT_LABEL)) {
         @Override
-        public List<Label> getDefault(Rule rule, AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.isCodeCoverageEnabled()
               ? ImmutableList.copyOf(configuration.getCoverageLabels())
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index e3e10c72a2..f93487feb9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -171,7 +171,7 @@ public final class AndroidRuleClasses {
   public static final LateBoundLabel<BuildConfiguration> ANDROID_SDK =
       new LateBoundLabel<BuildConfiguration>(DEFAULT_ANDROID_SDK, AndroidConfiguration.class) {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(AndroidConfiguration.class).getSdk();
         }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java
index 8b87724368..bbe4076bc8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java
@@ -189,7 +189,7 @@ public class AppleToolchain {
         new LateBoundLabel<BuildConfiguration>(
             AppleCommandLineOptions.DEFAULT_XCODE_VERSION_CONFIG_LABEL, AppleConfiguration.class) {
           @Override
-          public Label getDefault(Rule rule, AttributeMap attributes,
+          public Label resolve(Rule rule, AttributeMap attributes,
               BuildConfiguration configuration) {
             return configuration.getFragment(AppleConfiguration.class).getXcodeConfigLabel();
           }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
index 4519103d23..a795d18838 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
@@ -50,7 +50,7 @@ public final class CcToolchainRule implements RuleDefinition {
   private static final LateBoundLabel<BuildConfiguration> LIBC_TOP =
       new LateBoundLabel<BuildConfiguration>(CppConfiguration.class) {
         @Override
-        public Label getDefault(
+        public Label resolve(
             Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
           return configuration.getFragment(CppConfiguration.class).getLibcLabel();
         }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
index 12ef7ddb42..70ee87aefb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -91,7 +91,7 @@ public interface JavaSemantics {
   LateBoundLabel<BuildConfiguration> JAVA_TOOLCHAIN =
       new LateBoundLabel<BuildConfiguration>(JAVA_TOOLCHAIN_LABEL, JavaConfiguration.class) {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(JavaConfiguration.class).getToolchainLabel();
         }
@@ -123,7 +123,7 @@ public interface JavaSemantics {
   LateBoundLabel<BuildConfiguration> JVM =
       new LateBoundLabel<BuildConfiguration>(JavaImplicitAttributes.JDK_LABEL, Jvm.class) {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(Jvm.class).getJvmLabel();
         }
@@ -140,7 +140,7 @@ public interface JavaSemantics {
         }
 
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(Jvm.class).getJvmLabel();
         }
@@ -153,7 +153,7 @@ public interface JavaSemantics {
   LateBoundLabel<BuildConfiguration> JAVA_LAUNCHER =
       new LateBoundLabel<BuildConfiguration>(JavaConfiguration.class) {
         @Override
-        public Label getDefault(Rule rule, AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(JavaConfiguration.class).getJavaLauncherLabel();
         }
@@ -162,7 +162,7 @@ public interface JavaSemantics {
   LateBoundLabelList<BuildConfiguration> JAVA_PLUGINS =
       new LateBoundLabelList<BuildConfiguration>() {
         @Override
-        public List<Label> getDefault(Rule rule, AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return ImmutableList.copyOf(configuration.getPlugins());
         }
@@ -174,7 +174,7 @@ public interface JavaSemantics {
   LateBoundLabel<BuildConfiguration> PROGUARD =
       new LateBoundLabel<BuildConfiguration>(JavaConfiguration.class) {
         @Override
-        public Label getDefault(Rule rule,  AttributeMap attributes,
+        public Label resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return configuration.getFragment(JavaConfiguration.class).getProguardBinary();
         }
@@ -183,7 +183,7 @@ public interface JavaSemantics {
   LateBoundLabelList<BuildConfiguration> EXTRA_PROGUARD_SPECS =
       new LateBoundLabelList<BuildConfiguration>() {
         @Override
-        public List<Label> getDefault(Rule rule, AttributeMap attributes,
+        public List<Label> resolve(Rule rule, AttributeMap attributes,
             BuildConfiguration configuration) {
           return ImmutableList.copyOf(
               configuration.getFragment(JavaConfiguration.class).getExtraProguardSpecs());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java
index 448c4be9ba..12f69defd7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java
@@ -148,7 +148,7 @@ public class IosTestRule implements RuleDefinition {
                 .value(
                     new LateBoundLabelList<BuildConfiguration>(gcov) {
                       @Override
-                      public List<Label> getDefault(
+                      public List<Label> resolve(
                           Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
                         if (!configuration.isCodeCoverageEnabled()) {
                           return ImmutableList.of();
@@ -162,7 +162,7 @@ public class IosTestRule implements RuleDefinition {
                 .value(
                     new LateBoundLabel<BuildConfiguration>(mcov) {
                       @Override
-                      public Label getDefault(
+                      public Label resolve(
                           Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
                         if (!configuration.isCodeCoverageEnabled()) {
                           return null;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 14365541c4..76af1c2ce7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -148,7 +148,7 @@ public class ObjcRuleClasses {
   public static final LateBoundLabel<BuildConfiguration> APPLE_TOOLCHAIN =
       new LateBoundLabel<BuildConfiguration>(CROSSTOOL_LABEL, CppConfiguration.class) {
         @Override
-        public Label getDefault(
+        public Label resolve(
             Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
           return configuration.getFragment(CppConfiguration.class).getCcToolchainRuleLabel();
         }
@@ -162,7 +162,7 @@ public class ObjcRuleClasses {
   public static final LateBoundLabel<BuildConfiguration> NULL_LIPO_CONTEXT_COLLECTOR =
       new LateBoundLabel<BuildConfiguration>() {
         @Override
-        public Label getDefault(
+        public Label resolve(
             Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
           return null;
         }
@@ -927,7 +927,7 @@ public class ObjcRuleClasses {
                   .value(
                       new LateBoundLabel<BuildConfiguration>(ObjcConfiguration.class) {
                         @Override
-                        public Label getDefault(
+                        public Label resolve(
                             Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
                           return configuration
                               .getFragment(ObjcConfiguration.class)
@@ -953,7 +953,7 @@ public class ObjcRuleClasses {
                   .value(
                       new LateBoundLabel<BuildConfiguration>(ObjcConfiguration.class) {
                         @Override
-                        public Label getDefault(Rule rule, AttributeMap attributes,
+                        public Label resolve(Rule rule, AttributeMap attributes,
                             BuildConfiguration configuration) {
                           AppleConfiguration appleConfiguration =
                               configuration.getFragment(AppleConfiguration.class);
@@ -1250,7 +1250,7 @@ public class ObjcRuleClasses {
                   .value(
                       new LateBoundLabel<BuildConfiguration>(ObjcConfiguration.class) {
                         @Override
-                        public Label getDefault(Rule rule, AttributeMap attributes,
+                        public Label resolve(Rule rule, AttributeMap attributes,
                             BuildConfiguration configuration) {
                           AppleConfiguration appleConfiguration =
                               configuration.getFragment(AppleConfiguration.class);
@@ -1433,7 +1433,7 @@ public class ObjcRuleClasses {
                   .value(
                       new LateBoundLabel<BuildConfiguration>(ObjcConfiguration.class) {
                         @Override
-                        public Label getDefault(Rule rule, AttributeMap attributes,
+                        public Label resolve(Rule rule, AttributeMap attributes,
                             BuildConfiguration configuration) {
                           AppleConfiguration appleConfiguration =
                               configuration.getFragment(AppleConfiguration.class);