Roll-foward of commit 351475627b9e94e5afdf472cbf465f49c433a25e which was rolled back in commit 1250fdac4c7769cfa200af8b4f9b061024356fea. There was nothing wrong with that change.
--
MOS_MIGRATED_REVID=119756383
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index f77a271..57e6808 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -158,6 +158,7 @@
private RuleContext(
Builder builder,
+ AttributeMap attributes,
ListMultimap<String, ConfiguredTarget> targetMap,
ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap,
Set<ConfigMatchingProvider> configConditions,
@@ -172,8 +173,7 @@
this.targetMap = targetMap;
this.filesetEntryMap = filesetEntryMap;
this.configConditions = configConditions;
- this.attributes =
- ConfiguredAttributeMapper.of(builder.rule, configConditions);
+ this.attributes = attributes;
this.features = getEnabledFeatures();
this.ruleClassNameForLogging = ruleClassNameForLogging;
this.aspectAttributes = aspectAttributes;
@@ -1330,11 +1330,14 @@
Preconditions.checkNotNull(prerequisiteMap);
Preconditions.checkNotNull(configConditions);
Preconditions.checkNotNull(visibility);
+ AttributeMap attributes = ConfiguredAttributeMapper.of(rule, configConditions);
+ validateAttributes(attributes);
ListMultimap<String, ConfiguredTarget> targetMap = createTargetMap();
ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap =
createFilesetEntryMap(rule, configConditions);
return new RuleContext(
this,
+ attributes,
targetMap,
filesetEntryMap,
configConditions,
@@ -1343,6 +1346,10 @@
aspectAttributes != null ? aspectAttributes : ImmutableMap.<String, Attribute>of());
}
+ private void validateAttributes(AttributeMap attributes) {
+ rule.getRuleClassObject().checkAttributesNonEmpty(rule, reporter, attributes);
+ }
+
Builder setVisibility(NestedSet<PackageSpecification> visibility) {
this.visibility = visibility;
return this;