Added new RuleClass flag to turn off platform support, to stop dependency cycles when loading platforms.
Part of #4128.
Change-Id: Ie55a91aaaec15d8eb537f59131fc2e69a8f9c251
PiperOrigin-RevId: 176509311
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
index 31c436e9..3bb3095 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -228,9 +228,6 @@
@Nullable ToolchainContext toolchainContext)
throws InterruptedException {
if (target instanceof Rule) {
- Preconditions.checkArgument(
- toolchainContext != null,
- "ToolchainContext should never be null when creating a ConfiguredTarget for a Rule");
try {
CurrentRuleTracker.beginConfiguredTarget(((Rule) target).getRuleClassObject());
return createRule(
@@ -302,11 +299,13 @@
BuildConfiguration hostConfiguration,
OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
- ToolchainContext toolchainContext)
+ @Nullable ToolchainContext toolchainContext)
throws InterruptedException {
// Load the requested toolchains into the ToolchainContext.
- toolchainContext.resolveToolchains(prerequisiteMap);
+ if (toolchainContext != null) {
+ toolchainContext.resolveToolchains(prerequisiteMap);
+ }
// Visibility computation and checking is done for every rule.
RuleContext ruleContext =
@@ -409,13 +408,15 @@
Aspect aspect,
OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
- ToolchainContext toolchainContext,
+ @Nullable ToolchainContext toolchainContext,
BuildConfiguration aspectConfiguration,
BuildConfiguration hostConfiguration)
throws InterruptedException {
// Load the requested toolchains into the ToolchainContext.
- toolchainContext.resolveToolchains(prerequisiteMap);
+ if (toolchainContext != null) {
+ toolchainContext.resolveToolchains(prerequisiteMap);
+ }
RuleContext.Builder builder = new RuleContext.Builder(
env,
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java
index e301b0f..0548b00 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java
@@ -84,6 +84,7 @@
attr("path", STRING)
.undocumented(
"only used to expose FilegroupPathProvider, which is not currently used"))
+ .supportsPlatforms(false)
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 5f078d7..743625d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -486,6 +486,7 @@
private final Map<String, Attribute> attributes = new LinkedHashMap<>();
private final Set<Label> requiredToolchains = new HashSet<>();
+ private boolean supportsPlatforms = true;
/**
* Constructs a new {@code RuleClassBuilder} using all attributes from all
@@ -517,6 +518,7 @@
supportsConstraintChecking = parent.supportsConstraintChecking;
addRequiredToolchains(parent.getRequiredToolchains());
+ supportsPlatforms = parent.supportsPlatforms;
for (Attribute attribute : parent.getAttributes()) {
String attrName = attribute.getName();
@@ -599,6 +601,7 @@
configurationFragmentPolicy.build(),
supportsConstraintChecking,
requiredToolchains,
+ supportsPlatforms,
attributes.values().toArray(new Attribute[0]));
}
@@ -1010,6 +1013,11 @@
return this;
}
+ public Builder supportsPlatforms(boolean flag) {
+ this.supportsPlatforms = flag;
+ return this;
+ }
+
/**
* Returns an Attribute.Builder object which contains a replica of the
* same attribute in the parent rule if exists.
@@ -1132,6 +1140,7 @@
private final boolean supportsConstraintChecking;
private final ImmutableSet<Label> requiredToolchains;
+ private final boolean supportsPlatforms;
/**
* Constructs an instance of RuleClass whose name is 'name', attributes are 'attributes'. The
@@ -1181,6 +1190,7 @@
ConfigurationFragmentPolicy configurationFragmentPolicy,
boolean supportsConstraintChecking,
Set<Label> requiredToolchains,
+ boolean supportsPlatforms,
Attribute... attributes) {
this.name = name;
this.key = key;
@@ -1211,6 +1221,7 @@
this.configurationFragmentPolicy = configurationFragmentPolicy;
this.supportsConstraintChecking = supportsConstraintChecking;
this.requiredToolchains = ImmutableSet.copyOf(requiredToolchains);
+ this.supportsPlatforms = supportsPlatforms;
// Create the index and collect non-configurable attributes.
int index = 0;
@@ -2031,6 +2042,10 @@
return requiredToolchains;
}
+ public boolean supportsPlatforms() {
+ return supportsPlatforms;
+ }
+
public static boolean isThirdPartyPackage(PackageIdentifier packageIdentifier) {
if (!packageIdentifier.getRepository().isMain()) {
return false;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformBaseRule.java
index b11fb91..003b264 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/platform/PlatformBaseRule.java
@@ -39,6 +39,7 @@
.value(ImmutableList.of("manual"))
.nonconfigurable("low-level attribute, used in platform configuration"))
.exemptFromConstraintChecking("this rule helps *define* a constraint")
+ .supportsPlatforms(false)
.removeAttribute("deps")
.removeAttribute("data")
.build();
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index 099cea7..7622f43 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -208,12 +208,15 @@
// Determine what toolchains are needed by this target.
if (target instanceof Rule) {
Rule rule = ((Rule) target);
- ImmutableSet<Label> requiredToolchains = rule.getRuleClassObject().getRequiredToolchains();
- toolchainContext =
- ToolchainUtil.createToolchainContext(
- env, rule.toString(), requiredToolchains, configuration);
- if (env.valuesMissing()) {
- return null;
+ if (rule.getRuleClassObject().supportsPlatforms()) {
+ ImmutableSet<Label> requiredToolchains =
+ rule.getRuleClassObject().getRequiredToolchains();
+ toolchainContext =
+ ToolchainUtil.createToolchainContext(
+ env, rule.toString(), requiredToolchains, configuration);
+ if (env.valuesMissing()) {
+ return null;
+ }
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java
index 6676a18..ca311c8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainUtil.java
@@ -114,6 +114,9 @@
throws InterruptedException, ToolchainContextException {
PlatformConfiguration platformConfiguration =
configuration.getFragment(PlatformConfiguration.class);
+ if (platformConfiguration == null) {
+ return null;
+ }
Label executionPlatformLabel = platformConfiguration.getExecutionPlatform();
Label targetPlatformLabel = platformConfiguration.getTargetPlatforms().get(0);
