Provide more detail on the failing targets during attribute map failu…

…res. PiperOrigin-RevId: 571036040 Change-Id: If188372f2f00cd26a6af51d261d6ed9c95dd5441
bazel-io · Oct 5, 2023 · 5b4e986 · 5b4e986
1 parent 70fc6e4
commit 5b4e986
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 21 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapper.java
@@ -63,9 +63,10 @@ public <T> T get(String attributeName, Type<T> type) {
     } else {
       Attribute attribute = aspectAttributes.get(attributeName);
       if (attribute == null) {
-        throw new IllegalArgumentException(String.format(
-            "no attribute '%s' in either %s or its aspects",
-            attributeName, ruleAttributes.getLabel()));
+        throw new IllegalArgumentException(
+            String.format(
+                "no attribute '%s' in either %s or its aspects",
+                attributeName, ruleAttributes.describeRule()));
       } else if (attribute.getType() != type) {
         throw new IllegalArgumentException(String.format(
             "attribute %s has type %s, not expected type %s",

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AbstractAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/AbstractAttributeMapper.java
@@ -41,6 +41,11 @@ protected AbstractAttributeMapper(Rule rule) {
     this.rule = rule;
   }
 
+  @Override
+  public String describeRule() {
+    return String.format("%s %s", this.rule.getRuleClass(), getLabel());
+  }
+
   @Override
   public Label getLabel() {
     return ruleLabel;

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
@@ -1507,7 +1507,7 @@ public Object getDefault(AttributeMap rule) {
       Preconditions.checkState(
           lookupTable.containsKey(key),
           "Error in rule '%s': precomputed value missing for dependencies: %s. Available keys: %s.",
-          rule.getLabel(),
+          rule.describeRule(),
           Iterables.toString(key),
           Iterables.toString(lookupTable.keySet()));
       return lookupTable.get(key);

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AttributeMap.java b/src/main/java/com/google/devtools/build/lib/packages/AttributeMap.java
@@ -28,6 +28,11 @@
  * its particular needs are.
  */
 public interface AttributeMap {
+  /** Describe the underlying rule, for use in messages. */
+  default String describeRule() {
+    return getLabel().toString();
+  }
+
   /**
    * Returns the label of the rule.
    */

diff --git a/src/main/java/com/google/devtools/build/lib/packages/ConfiguredAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/ConfiguredAttributeMapper.java
@@ -58,21 +58,6 @@
  */
 public class ConfiguredAttributeMapper extends AbstractAttributeMapper {
 
-  private final Map<Label, ConfigMatchingProvider> configConditions;
-  private final String configHash;
-  private final boolean alwaysSucceed;
-
-  private ConfiguredAttributeMapper(
-      Rule rule,
-      ImmutableMap<Label, ConfigMatchingProvider> configConditions,
-      String configHash,
-      boolean alwaysSucceed) {
-    super(Preconditions.checkNotNull(rule));
-    this.configConditions = configConditions;
-    this.configHash = configHash;
-    this.alwaysSucceed = alwaysSucceed;
-  }
-
   /**
    * "Manual" constructor that requires the caller to pass the set of configurability conditions
    * that trigger this rule's configurable attributes.
@@ -101,7 +86,27 @@ public static ConfiguredAttributeMapper of(
       BuildConfigurationValue configuration) {
     boolean alwaysSucceed =
         configuration.getOptions().get(CoreOptions.class).debugSelectsAlwaysSucceed;
-    return of(rule, configConditions, configuration.checksum(), alwaysSucceed);
+    return of(rule, configConditions, configuration.shortId(), alwaysSucceed);
+  }
+
+  private final ImmutableMap<Label, ConfigMatchingProvider> configConditions;
+  private final String configHash;
+  private final boolean alwaysSucceed;
+
+  private ConfiguredAttributeMapper(
+      Rule rule,
+      ImmutableMap<Label, ConfigMatchingProvider> configConditions,
+      String configHash,
+      boolean alwaysSucceed) {
+    super(Preconditions.checkNotNull(rule));
+    this.configConditions = configConditions;
+    this.configHash = configHash;
+    this.alwaysSucceed = alwaysSucceed;
+  }
+
+  @Override
+  public String describeRule() {
+    return String.format("%s (%s)", super.describeRule(), this.configHash.substring(0, 6));
   }
 
   /**

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapperTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectAwareAttributeMapperTest.java
@@ -105,7 +105,8 @@ public void getMissingAttributeValue() throws Exception {
         assertThrows(IllegalArgumentException.class, () -> mapper.get("noexist", BuildType.LABEL));
     assertThat(e)
         .hasMessageThat()
-        .isEqualTo("no attribute 'noexist' in either //foo:myrule or its aspects");
+        .matches(
+            "no attribute 'noexist' in either cc_binary //foo:myrule \\([^)]+\\) or its aspects");
   }
 
   @Test