Skylark no longer crashes when the default value of an attribute is a label string that points to a remote repository.
Fixes #1442.
--
MOS_MIGRATED_REVID=132320130
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 fed7bd4..80bba9b 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
@@ -620,14 +620,24 @@
/**
* See value(TYPE) above. This method is only meant for Skylark usage.
+ *
+ * <p>The parameter {@code context} is relevant iff the default value is a Label string.
+ * In this case, {@code context} must point to the parent Label in order to be able to convert
+ * the default value string to a proper Label.
*/
- public Builder<TYPE> defaultValue(Object defaultValue) throws ConversionException {
+ public Builder<TYPE> defaultValue(Object defaultValue, Object context)
+ throws ConversionException {
Preconditions.checkState(!valueSet, "the default value is already set");
- value = type.convert(defaultValue, "attribute " + name);
+ value = type.convert(defaultValue, "attribute " + name, context);
valueSet = true;
return this;
}
+ /** See value(TYPE) above. This method is only meant for Skylark usage. */
+ public Builder<TYPE> defaultValue(Object defaultValue) throws ConversionException {
+ return defaultValue(defaultValue, null);
+ }
+
public boolean isValueSet() {
return valueSet;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
index ea52e11..2e4bbb6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
@@ -172,7 +172,7 @@
new SkylarkComputedDefaultTemplate(
type, callback.getParameterNames(), callback, ast.getLocation()));
} else {
- builder.defaultValue(defaultValue);
+ builder.defaultValue(defaultValue, env.getGlobals().label());
}
}
