Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix visibility check at definition for aspects #19442

Closed
wants to merge 1 commit into from
Closed

Fix visibility check at definition for aspects #19442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/com/google/devtools/build/lib/analysis/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@ java_library(
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/packages/semantics",
"//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_and_data",
"//third_party:guava",
],
)

Expand Down
30 changes: 25 additions & 5 deletions src/main/java/com/google/devtools/build/lib/analysis/CommonPrerequisiteValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,23 @@
// limitations under the License.
package com.google.devtools.build.lib.analysis;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper.attributeOrNull;

import com.google.devtools.build.lib.analysis.AliasProvider.TargetMode;
import com.google.devtools.build.lib.analysis.RuleContext.PrerequisiteValidator;
import com.google.devtools.build.lib.analysis.configuredtargets.PackageGroupConfiguredTarget;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.packages.Aspect;
import com.google.devtools.build.lib.packages.Attribute;
import com.google.devtools.build.lib.packages.FunctionSplitTransitionAllowlist;
import com.google.devtools.build.lib.packages.InputFile;
import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper;
import com.google.devtools.build.lib.packages.RawAttributeMapper;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.packages.StarlarkAspectClass;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
Expand Down Expand Up @@ -105,16 +108,33 @@ private void validateDirectPrerequisiteVisibility(
if (!toolCheckAtDefinition
|| !attribute.isImplicit()
|| attribute.getName().equals(RuleClass.CONFIG_SETTING_DEPS_ATTRIBUTE)
|| rule.getRuleClassObject().getRuleDefinitionEnvironmentLabel() == null) {
|| !context.isStarlarkRuleOrAspect()) {
// Default check: The attribute must be visible from the target.
if (!context.isVisible(prerequisite.getConfiguredTarget())) {
handleVisibilityConflict(context, prerequisite, rule.getLabel());
}
} else {
// For implicit attributes, check if the prerequisite is visible from the location of the
// rule definition
Label implicitDefinition = rule.getRuleClassObject().getRuleDefinitionEnvironmentLabel();
if (!RuleContext.isVisible(implicitDefinition, prerequisite.getConfiguredTarget())) {
// For implicit attributes of Starlark rules or aspects, check if the prerequisite is visible
// from the location of the definition that declares the attribute. Only perform this check
// for the current aspect.
Label implicitDefinition = null;
Aspect mainAspect = context.getMainAspect();
if (mainAspect != null) {
// Only verify visibility of implicit dependencies of the current aspect. Implicit
// dependencies of other aspects as well as the rule itself are checked when they are
// evaluated.
if (mainAspect.getDefinition().getAttributes().containsKey(attrName)) {
StarlarkAspectClass aspectClass = (StarlarkAspectClass) mainAspect.getAspectClass();
// Never null since we already checked that the aspect is Starlark-defined.
implicitDefinition = checkNotNull(aspectClass.getExtensionLabel());
}
} else {
// Never null since we already checked that the rule is a Starlark rule.
implicitDefinition =
checkNotNull(rule.getRuleClassObject().getRuleDefinitionEnvironmentLabel());
}
if (implicitDefinition != null
&& !RuleContext.isVisible(implicitDefinition, prerequisite.getConfiguredTarget())) {
handleVisibilityConflict(context, prerequisite, implicitDefinition);
}
}
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
import com.google.devtools.build.lib.packages.StarlarkAspectClass;
import com.google.devtools.build.lib.packages.StarlarkProviderWrapper;
import com.google.devtools.build.lib.packages.SymbolGenerator;
import com.google.devtools.build.lib.packages.Target;
Expand Down Expand Up @@ -2091,6 +2092,20 @@ public boolean isVisible(TransitiveInfoCollection prerequisite) {
return RuleContext.isVisible(target.getAssociatedRule(), prerequisite);
}

@Nullable
Aspect getMainAspect() {
fmeum marked this conversation as resolved.
Show resolved Hide resolved
return Streams.findLast(aspects.stream()).orElse(null);
}

boolean isStarlarkRuleOrAspect() {
Aspect mainAspect = getMainAspect();
if (mainAspect != null) {
return mainAspect.getAspectClass() instanceof StarlarkAspectClass;
} else {
return getRule().getRuleClassObject().getRuleDefinitionEnvironmentLabel() != null;
}
}

private void validateDirectPrerequisiteFileTypes(
ConfiguredTargetAndData prerequisite, Attribute attribute) {
if (attribute.isSkipAnalysisTimeFileTypeCheck()) {
Expand Down
Loading