Start the process of getting Target out of ConfiguredTarget: add a new container, ConfiguredTargetAndTarget, that can be used to access Targets, and deprecate ConfiguredTarget#getTarget. ConfiguredAndTargetObjects are intended to be limited in scope, not being persisted to Skyframe.
The eventual plan is to remove the target field from ConfiguredTarget.
This CL is mostly straightforward, except for dealing with AliasConfiguredTargets, which cause some complications.
A significant cleanup is still needed before #getTarget can be removed, but I don't see any impossible blockers. We will may still need to store a Target-like object in ConfiguredTarget (that has the RuleClass, or at least a string representation of it, for instance), but that will let us avoid storing a full Target together with its associated Package.
PiperOrigin-RevId: 182371566
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AliasProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/AliasProvider.java
index e792cb6..e650ec5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AliasProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AliasProvider.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
/**
* A provider that gives information about the aliases a rule was resolved through.
@@ -65,12 +66,12 @@
return aliasChain;
}
- public static String printLabelWithAliasChain(ConfiguredTarget target) {
- AliasProvider aliasProvider = target.getProvider(AliasProvider.class);
+ public static String printLabelWithAliasChain(ConfiguredTargetAndTarget target) {
+ AliasProvider aliasProvider = target.getConfiguredTarget().getProvider(AliasProvider.class);
String suffix = aliasProvider == null
? ""
: " (aliased through '" + Joiner.on("' -> '").join(aliasProvider.getAliasChain()) + "')";
- return "'" + target.getLabel() + "'" + suffix;
+ return "'" + target.getTarget().getLabel() + "'" + suffix;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java
index 35eeae8..79baad0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectResolver.java
@@ -25,6 +25,7 @@
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.skyframe.AspectFunction;
import com.google.devtools.build.lib.skyframe.AspectValue;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
import com.google.devtools.build.lib.util.OrderedSetMultimap;
import com.google.devtools.build.skyframe.SkyFunction;
@@ -49,7 +50,7 @@
@Nullable
public static OrderedSetMultimap<Dependency, ConfiguredAspect> resolveAspectDependencies(
SkyFunction.Environment env,
- Map<SkyKey, ConfiguredTarget> configuredTargetMap,
+ Map<SkyKey, ConfiguredTargetAndTarget> configuredTargetMap,
Iterable<Dependency> deps,
@Nullable NestedSetBuilder<Package> transitivePackages)
throws AspectFunction.AspectCreationException, InterruptedException {
@@ -89,8 +90,9 @@
}
// Validate that aspect is applicable to "bare" configured target.
- ConfiguredTarget associatedTarget = configuredTargetMap
- .get(ConfiguredTargetValue.key(dep.getLabel(), dep.getConfiguration()));
+ ConfiguredTargetAndTarget associatedTarget =
+ configuredTargetMap.get(
+ ConfiguredTargetValue.key(dep.getLabel(), dep.getConfiguration()));
if (!aspectMatchesConfiguredTarget(associatedTarget, aspectValue.getAspect())) {
continue;
}
@@ -113,20 +115,23 @@
* combinations of aspects for a particular configured target, so it would result in a
* combinatorial explosion of Skyframe nodes.
*/
- public static OrderedSetMultimap<Attribute, ConfiguredTarget> mergeAspects(
+ public static OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> mergeAspects(
OrderedSetMultimap<Attribute, Dependency> depValueNames,
- Map<SkyKey, ConfiguredTarget> depConfiguredTargetMap,
+ Map<SkyKey, ConfiguredTargetAndTarget> depConfiguredTargetMap,
OrderedSetMultimap<Dependency, ConfiguredAspect> depAspectMap)
throws MergedConfiguredTarget.DuplicateException {
- OrderedSetMultimap<Attribute, ConfiguredTarget> result = OrderedSetMultimap.create();
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> result = OrderedSetMultimap.create();
for (Map.Entry<Attribute, Dependency> entry : depValueNames.entries()) {
Dependency dep = entry.getValue();
SkyKey depKey = ConfiguredTargetValue.key(dep.getLabel(), dep.getConfiguration());
- ConfiguredTarget depConfiguredTarget = depConfiguredTargetMap.get(depKey);
+ ConfiguredTargetAndTarget depConfiguredTarget = depConfiguredTargetMap.get(depKey);
- result.put(entry.getKey(),
- MergedConfiguredTarget.of(depConfiguredTarget, depAspectMap.get(dep)));
+ result.put(
+ entry.getKey(),
+ depConfiguredTarget.fromConfiguredTarget(
+ MergedConfiguredTarget.of(
+ depConfiguredTarget.getConfiguredTarget(), depAspectMap.get(dep))));
}
return result;
@@ -160,7 +165,8 @@
return aspectKey;
}
- public static boolean aspectMatchesConfiguredTarget(final ConfiguredTarget dep, Aspect aspect) {
+ public static boolean aspectMatchesConfiguredTarget(
+ ConfiguredTargetAndTarget dep, Aspect aspect) {
if (!aspect.getDefinition().applyToFiles() && !(dep.getTarget() instanceof Rule)) {
return false;
}
@@ -168,6 +174,6 @@
// even aspects that 'apply to files' cannot apply to input files.
return false;
}
- return dep.satisfies(aspect.getDefinition().getRequiredProviders());
+ return dep.getConfiguredTarget().satisfies(aspect.getDefinition().getRequiredProviders());
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 4b58054..95ea703 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -21,6 +21,7 @@
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
@@ -80,6 +81,7 @@
import com.google.devtools.build.lib.skyframe.AspectValue;
import com.google.devtools.build.lib.skyframe.AspectValue.AspectKey;
import com.google.devtools.build.lib.skyframe.AspectValue.AspectValueKey;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.skyframe.CoverageReportValue;
import com.google.devtools.build.lib.skyframe.SkyframeAnalysisResult;
@@ -894,13 +896,15 @@
BuildConfigurationCollection configurations)
throws EvalException, InvalidConfigurationException,
InterruptedException, InconsistentAspectOrderException {
- return skyframeExecutor.getConfiguredTargets(
- eventHandler,
- ct.getConfiguration(),
- ImmutableSet.copyOf(
- getDirectPrerequisiteDependenciesForTesting(
- eventHandler, ct, configurations, /*toolchainContext=*/ null)
- .values()));
+ return Collections2.transform(
+ skyframeExecutor.getConfiguredTargets(
+ eventHandler,
+ ct.getConfiguration(),
+ ImmutableSet.copyOf(
+ getDirectPrerequisiteDependenciesForTesting(
+ eventHandler, ct, configurations, /*toolchainContext=*/ null)
+ .values())),
+ ConfiguredTargetAndTarget::getConfiguredTarget);
}
@VisibleForTesting
@@ -1002,7 +1006,7 @@
return ImmutableMap.copyOf(keys);
}
- private OrderedSetMultimap<Attribute, ConfiguredTarget> getPrerequisiteMapForTesting(
+ private OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> getPrerequisiteMapForTesting(
final ExtendedEventHandler eventHandler,
ConfiguredTarget target,
BuildConfigurationCollection configurations,
@@ -1013,11 +1017,11 @@
getDirectPrerequisiteDependenciesForTesting(
eventHandler, target, configurations, toolchainContext);
- ImmutableMultimap<Dependency, ConfiguredTarget> cts = skyframeExecutor.getConfiguredTargetMap(
- eventHandler,
- target.getConfiguration(), ImmutableSet.copyOf(depNodeNames.values()));
+ ImmutableMultimap<Dependency, ConfiguredTargetAndTarget> cts =
+ skyframeExecutor.getConfiguredTargetMap(
+ eventHandler, target.getConfiguration(), ImmutableSet.copyOf(depNodeNames.values()));
- OrderedSetMultimap<Attribute, ConfiguredTarget> result = OrderedSetMultimap.create();
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> result = OrderedSetMultimap.create();
for (Map.Entry<Attribute, Dependency> entry : depNodeNames.entries()) {
result.putAll(entry.getKey(), cts.get(entry.getValue()));
}
@@ -1111,7 +1115,7 @@
ToolchainContext toolchainContext =
skyframeExecutor.getToolchainContextForTesting(
requiredToolchains, targetConfig, eventHandler);
- OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap =
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap =
getPrerequisiteMapForTesting(eventHandler, target, configurations, toolchainContext);
toolchainContext.resolveToolchains(prerequisiteMap);
@@ -1147,13 +1151,13 @@
BuildConfigurationCollection configurations)
throws EvalException, InvalidConfigurationException, InterruptedException,
InconsistentAspectOrderException {
- Collection<ConfiguredTarget> configuredTargets =
+ Collection<ConfiguredTargetAndTarget> configuredTargets =
getPrerequisiteMapForTesting(
eventHandler, dependentTarget, configurations, /*toolchainContext=*/ null)
.values();
- for (ConfiguredTarget ct : configuredTargets) {
- if (ct.getLabel().equals(desiredTarget)) {
- return ct;
+ for (ConfiguredTargetAndTarget ct : configuredTargets) {
+ if (ct.getTarget().getLabel().equals(desiredTarget)) {
+ return ct.getConfiguredTarget();
}
}
return null;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
index 76fc7d3..c52b947 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -52,6 +52,7 @@
import com.google.devtools.build.lib.packages.RuleErrorConsumer;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
import com.google.devtools.build.lib.syntax.Environment;
import com.google.devtools.build.lib.syntax.Environment.Extension;
@@ -85,14 +86,16 @@
*/
public interface PrerequisiteValidator {
/**
- * Checks whether the rule in {@code contextBuilder} is allowed to depend on
- * {@code prerequisite} through the attribute {@code attribute}.
+ * Checks whether the rule in {@code contextBuilder} is allowed to depend on {@code
+ * prerequisite} through the attribute {@code attribute}.
*
* <p>Can be used for enforcing any organization-specific policies about the layout of the
* workspace.
*/
void validate(
- RuleContext.Builder contextBuilder, ConfiguredTarget prerequisite, Attribute attribute);
+ RuleContext.Builder contextBuilder,
+ ConfiguredTargetAndTarget prerequisite,
+ Attribute attribute);
}
/** Validator to check for and warn on the deprecation of dependencies. */
@@ -100,7 +103,9 @@
/** Checks if the given prerequisite is deprecated and prints a warning if so. */
@Override
public void validate(
- RuleContext.Builder contextBuilder, ConfiguredTarget prerequisite, Attribute attribute) {
+ RuleContext.Builder contextBuilder,
+ ConfiguredTargetAndTarget prerequisite,
+ Attribute attribute) {
validateDirectPrerequisiteForDeprecation(
contextBuilder, contextBuilder.getRule(), prerequisite, contextBuilder.forAspect());
}
@@ -148,7 +153,10 @@
/** Checks if the given prerequisite is deprecated and prints a warning if so. */
public static void validateDirectPrerequisiteForDeprecation(
- RuleErrorConsumer errors, Rule rule, ConfiguredTarget prerequisite, boolean forAspect) {
+ RuleErrorConsumer errors,
+ Rule rule,
+ ConfiguredTargetAndTarget prerequisite,
+ boolean forAspect) {
Target prerequisiteTarget = prerequisite.getTarget();
Label prerequisiteLabel = prerequisiteTarget.getLabel();
PackageIdentifier thatPackage = prerequisiteLabel.getPackageIdentifier();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTarget.java
index d1aa887..78391b4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTarget.java
@@ -45,10 +45,13 @@
*/
String FILES_FIELD = "files";
-
/**
- * Returns the Target with which this {@link ConfiguredTarget} is associated.
+ * Returns the {@link Target} with which this {@link ConfiguredTarget} is associated.
+ *
+ * <p>Do not add new usages if possible. Prefer {@link #getLabel}, or use {@code
+ * ConfiguredTargetAndTarget} objects.
*/
+ @Deprecated
Target getTarget();
/**
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 af99802..bcb3748 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
@@ -65,6 +65,7 @@
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.profiler.memory.CurrentRuleTracker;
import com.google.devtools.build.lib.skyframe.BuildConfigurationValue;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.util.OrderedSetMultimap;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -98,7 +99,7 @@
* to the {@code AnalysisEnvironment}.
*/
private NestedSet<PackageGroupContents> convertVisibility(
- OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
EventHandler reporter,
Target target,
BuildConfiguration packageGroupConfiguration) {
@@ -116,7 +117,7 @@
NestedSetBuilder<PackageGroupContents> result = NestedSetBuilder.stableOrder();
for (Label groupLabel : packageGroupsVisibility.getPackageGroups()) {
// PackageGroupsConfiguredTargets are always in the package-group configuration.
- ConfiguredTarget group =
+ TransitiveInfoCollection group =
findPrerequisite(prerequisiteMap, groupLabel, packageGroupConfiguration);
PackageSpecificationProvider provider = null;
// group == null can only happen if the package group list comes
@@ -145,12 +146,14 @@
}
}
- private ConfiguredTarget findPrerequisite(
- OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap, Label label,
+ private TransitiveInfoCollection findPrerequisite(
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
+ Label label,
BuildConfiguration config) {
- for (ConfiguredTarget prerequisite : prerequisiteMap.get(null)) {
- if (prerequisite.getLabel().equals(label) && (prerequisite.getConfiguration() == config)) {
- return prerequisite;
+ for (ConfiguredTargetAndTarget prerequisite : prerequisiteMap.get(null)) {
+ if (prerequisite.getTarget().getLabel().equals(label)
+ && (prerequisite.getConfiguredTarget().getConfiguration() == config)) {
+ return prerequisite.getConfiguredTarget();
}
}
return null;
@@ -227,7 +230,7 @@
Target target,
BuildConfiguration config,
BuildConfiguration hostConfig,
- OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
@Nullable ToolchainContext toolchainContext)
throws InterruptedException {
@@ -301,7 +304,7 @@
Rule rule,
BuildConfiguration configuration,
BuildConfiguration hostConfiguration,
- OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
@Nullable ToolchainContext toolchainContext)
throws InterruptedException {
@@ -406,11 +409,11 @@
*/
public ConfiguredAspect createAspect(
AnalysisEnvironment env,
- ConfiguredTarget associatedTarget,
+ ConfiguredTargetAndTarget associatedTarget,
ImmutableList<Aspect> aspectPath,
ConfiguredAspectFactory aspectFactory,
Aspect aspect,
- OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
@Nullable ToolchainContext toolchainContext,
BuildConfiguration aspectConfiguration,
@@ -449,8 +452,9 @@
return null;
}
- ConfiguredAspect configuredAspect = aspectFactory
- .create(associatedTarget, ruleContext, aspect.getParameters());
+ ConfiguredAspect configuredAspect =
+ aspectFactory.create(
+ associatedTarget.getConfiguredTarget(), ruleContext, aspect.getParameters());
if (configuredAspect != null) {
validateAdvertisedProviders(
configuredAspect, aspect.getDefinition().getAdvertisedProviders(),
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 674fd55..a02d410 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
@@ -29,6 +29,7 @@
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Lists;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Sets;
import com.google.devtools.build.lib.actions.Action;
@@ -86,6 +87,7 @@
import com.google.devtools.build.lib.packages.RuleErrorConsumer;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.TargetUtils;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.Type;
import com.google.devtools.build.lib.syntax.Type.LabelClass;
@@ -169,7 +171,7 @@
*/
private final ImmutableList<Aspect> aspects;
private final ImmutableList<AspectDescriptor> aspectDescriptors;
- private final ListMultimap<String, ConfiguredTarget> targetMap;
+ private final ListMultimap<String, ConfiguredTargetAndTarget> targetMap;
private final ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap;
private final ImmutableMap<Label, ConfigMatchingProvider> configConditions;
private final AspectAwareAttributeMapper attributes;
@@ -189,7 +191,7 @@
private RuleContext(
Builder builder,
AttributeMap attributes,
- ListMultimap<String, ConfiguredTarget> targetMap,
+ ListMultimap<String, ConfiguredTargetAndTarget> targetMap,
ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
Class<? extends BuildConfiguration.Fragment> universalFragment,
@@ -368,7 +370,11 @@
* Returns an immutable map from attribute name to list of configured targets for that attribute.
*/
public ListMultimap<String, ? extends TransitiveInfoCollection> getConfiguredTargetMap() {
- return targetMap;
+ return Multimaps.transformValues(targetMap, ConfiguredTargetAndTarget::getConfiguredTarget);
+ }
+
+ private List<? extends TransitiveInfoCollection> getDeps(String key) {
+ return Lists.transform(targetMap.get(key), ConfiguredTargetAndTarget::getConfiguredTarget);
}
/**
@@ -726,8 +732,8 @@
ImmutableMap.Builder<String, TransitiveInfoCollection> result = ImmutableMap.builder();
Map<String, Label> dict = attributes().get(attributeName, BuildType.LABEL_DICT_UNARY);
Map<Label, ConfiguredTarget> labelToDep = new HashMap<>();
- for (ConfiguredTarget dep : targetMap.get(attributeName)) {
- labelToDep.put(dep.getLabel(), dep);
+ for (ConfiguredTargetAndTarget dep : targetMap.get(attributeName)) {
+ labelToDep.put(dep.getTarget().getLabel(), dep.getConfiguredTarget());
}
for (Map.Entry<String, Label> entry : dict.entrySet()) {
@@ -758,7 +764,7 @@
}
checkAttribute(attributeName, mode);
- return targetMap.get(attributeName);
+ return getDeps(attributeName);
}
/**
@@ -773,7 +779,7 @@
Attribute attributeDefinition = attributes().getAttributeDefinition(attributeName);
SplitTransition transition = attributeDefinition.getSplitTransition(
ConfiguredAttributeMapper.of(rule, configConditions));
- List<ConfiguredTarget> deps = targetMap.get(attributeName);
+ List<? extends TransitiveInfoCollection> deps = getDeps(attributeName);
List<BuildOptions> splitOptions = transition.split(getConfiguration().getOptions());
if (splitOptions.isEmpty()) {
@@ -823,7 +829,7 @@
*/
public TransitiveInfoCollection getPrerequisite(String attributeName, Mode mode) {
checkAttribute(attributeName, mode);
- List<? extends TransitiveInfoCollection> elements = targetMap.get(attributeName);
+ List<? extends TransitiveInfoCollection> elements = getDeps(attributeName);
if (elements.size() > 1) {
throw new IllegalStateException(getRuleClassNameForLogging() + " attribute " + attributeName
+ " produces more than one prerequisite");
@@ -1392,7 +1398,7 @@
private final BuildConfiguration hostConfiguration;
private final PrerequisiteValidator prerequisiteValidator;
private final ErrorReporter reporter;
- private OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap;
+ private OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap;
private ImmutableMap<Label, ConfigMatchingProvider> configConditions;
private NestedSet<PackageGroupContents> visibility;
private ImmutableMap<String, Attribute> aspectAttributes;
@@ -1423,7 +1429,7 @@
Preconditions.checkNotNull(visibility);
AttributeMap attributes = ConfiguredAttributeMapper.of(rule, configConditions);
validateAttributes(attributes);
- ListMultimap<String, ConfiguredTarget> targetMap = createTargetMap();
+ ListMultimap<String, ConfiguredTargetAndTarget> targetMap = createTargetMap();
ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap =
createFilesetEntryMap(rule, configConditions);
return new RuleContext(
@@ -1451,7 +1457,8 @@
* Sets the prerequisites and checks their visibility. It also generates appropriate error or
* warning messages and sets the error flag as appropriate.
*/
- Builder setPrerequisites(OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap) {
+ Builder setPrerequisites(
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) {
this.prerequisiteMap = Preconditions.checkNotNull(prerequisiteMap);
return this;
}
@@ -1500,8 +1507,8 @@
return this;
}
- private boolean validateFilesetEntry(FilesetEntry filesetEntry, ConfiguredTarget src) {
- if (src.getProvider(FilesetProvider.class) != null) {
+ private boolean validateFilesetEntry(FilesetEntry filesetEntry, ConfiguredTargetAndTarget src) {
+ if (src.getConfiguredTarget().getProvider(FilesetProvider.class) != null) {
return true;
}
if (filesetEntry.isSourceFileset()) {
@@ -1538,25 +1545,27 @@
continue;
}
String attributeName = attr.getName();
- Map<Label, ConfiguredTarget> ctMap = new HashMap<>();
- for (ConfiguredTarget prerequisite : prerequisiteMap.get(attr)) {
- ctMap.put(AliasProvider.getDependencyLabel(prerequisite), prerequisite);
+ Map<Label, ConfiguredTargetAndTarget> ctMap = new HashMap<>();
+ for (ConfiguredTargetAndTarget prerequisite : prerequisiteMap.get(attr)) {
+ ctMap.put(
+ AliasProvider.getDependencyLabel(prerequisite.getConfiguredTarget()), prerequisite);
}
List<FilesetEntry> entries = ConfiguredAttributeMapper.of(rule, configConditions)
.get(attributeName, BuildType.FILESET_ENTRY_LIST);
for (FilesetEntry entry : entries) {
if (entry.getFiles() == null) {
Label label = entry.getSrcLabel();
- ConfiguredTarget src = ctMap.get(label);
+ ConfiguredTargetAndTarget src = ctMap.get(label);
if (!validateFilesetEntry(entry, src)) {
continue;
}
- mapBuilder.put(attributeName, new ConfiguredFilesetEntry(entry, src));
+ mapBuilder.put(
+ attributeName, new ConfiguredFilesetEntry(entry, src.getConfiguredTarget()));
} else {
ImmutableList.Builder<TransitiveInfoCollection> files = ImmutableList.builder();
for (Label file : entry.getFiles()) {
- files.add(ctMap.get(file));
+ files.add(ctMap.get(file).getConfiguredTarget());
}
mapBuilder.put(attributeName, new ConfiguredFilesetEntry(entry, files.build()));
}
@@ -1565,14 +1574,12 @@
return mapBuilder.build();
}
- /**
- * Determines and returns a map from attribute name to list of configured targets.
- */
- private ImmutableSortedKeyListMultimap<String, ConfiguredTarget> createTargetMap() {
- ImmutableSortedKeyListMultimap.Builder<String, ConfiguredTarget> mapBuilder =
+ /** Determines and returns a map from attribute name to list of configured targets. */
+ private ImmutableSortedKeyListMultimap<String, ConfiguredTargetAndTarget> createTargetMap() {
+ ImmutableSortedKeyListMultimap.Builder<String, ConfiguredTargetAndTarget> mapBuilder =
ImmutableSortedKeyListMultimap.builder();
- for (Map.Entry<Attribute, Collection<ConfiguredTarget>> entry :
+ for (Map.Entry<Attribute, Collection<ConfiguredTargetAndTarget>> entry :
prerequisiteMap.asMap().entrySet()) {
Attribute attribute = entry.getKey();
if (attribute == null) {
@@ -1586,7 +1593,7 @@
if (attribute.isSilentRuleClassFilter()) {
Predicate<RuleClass> filter = attribute.getAllowedRuleClassesPredicate();
- for (ConfiguredTarget configuredTarget : entry.getValue()) {
+ for (ConfiguredTargetAndTarget configuredTarget : entry.getValue()) {
Target prerequisiteTarget = configuredTarget.getTarget();
if ((prerequisiteTarget instanceof Rule)
&& filter.apply(((Rule) prerequisiteTarget).getRuleClassObject())) {
@@ -1595,7 +1602,7 @@
}
}
} else {
- for (ConfiguredTarget configuredTarget : entry.getValue()) {
+ for (ConfiguredTargetAndTarget configuredTarget : entry.getValue()) {
validateDirectPrerequisite(attribute, configuredTarget);
mapBuilder.put(attribute.getName(), configuredTarget);
}
@@ -1657,8 +1664,11 @@
reporter.assertNoErrors();
}
- private String badPrerequisiteMessage(String targetKind, ConfiguredTarget prerequisite,
- String reason, boolean isWarning) {
+ private String badPrerequisiteMessage(
+ String targetKind,
+ ConfiguredTargetAndTarget prerequisite,
+ String reason,
+ boolean isWarning) {
String msgPrefix = targetKind != null ? targetKind + " " : "";
String msgReason = reason != null ? " (" + reason + ")" : "";
if (isWarning) {
@@ -1671,8 +1681,12 @@
msgPrefix, AliasProvider.printLabelWithAliasChain(prerequisite), msgReason);
}
- private void reportBadPrerequisite(Attribute attribute, String targetKind,
- ConfiguredTarget prerequisite, String reason, boolean isWarning) {
+ private void reportBadPrerequisite(
+ Attribute attribute,
+ String targetKind,
+ ConfiguredTargetAndTarget prerequisite,
+ String reason,
+ boolean isWarning) {
String message = badPrerequisiteMessage(targetKind, prerequisite, reason, isWarning);
if (isWarning) {
attributeWarning(attribute.getName(), message);
@@ -1681,8 +1695,8 @@
}
}
- private void validateDirectPrerequisiteType(ConfiguredTarget prerequisite,
- Attribute attribute) {
+ private void validateDirectPrerequisiteType(
+ ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
Target prerequisiteTarget = prerequisite.getTarget();
Label prerequisiteLabel = prerequisiteTarget.getLabel();
@@ -1764,8 +1778,8 @@
return RuleContext.isVisible(rule, prerequisite);
}
- private void validateDirectPrerequisiteFileTypes(ConfiguredTarget prerequisite,
- Attribute attribute) {
+ private void validateDirectPrerequisiteFileTypes(
+ ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
if (attribute.isSkipAnalysisTimeFileTypeCheck()) {
return;
}
@@ -1785,11 +1799,12 @@
// If we performed this check when allowedFileTypes == NO_FILE this would
// always throw an error in those cases
if (allowedFileTypes != FileTypeSet.NO_FILE) {
- Iterable<Artifact> artifacts = prerequisite.getProvider(FileProvider.class)
- .getFilesToBuild();
+ Iterable<Artifact> artifacts =
+ prerequisite.getConfiguredTarget().getProvider(FileProvider.class).getFilesToBuild();
if (attribute.isSingleArtifact() && Iterables.size(artifacts) != 1) {
- attributeError(attribute.getName(),
- "'" + prerequisite.getLabel() + "' must produce a single file");
+ attributeError(
+ attribute.getName(),
+ "'" + prerequisite.getTarget().getLabel() + "' must produce a single file");
return;
}
for (Artifact sourceArtifact : artifacts) {
@@ -1797,9 +1812,17 @@
return;
}
}
- attributeError(attribute.getName(), "'" + prerequisite.getLabel()
- + "' does not produce any " + getRuleClassNameForLogging() + " " + attribute.getName()
- + " files (expected " + allowedFileTypes + ")");
+ attributeError(
+ attribute.getName(),
+ "'"
+ + prerequisite.getTarget().getLabel()
+ + "' does not produce any "
+ + getRuleClassNameForLogging()
+ + " "
+ + attribute.getName()
+ + " files (expected "
+ + allowedFileTypes
+ + ")");
}
}
@@ -1808,7 +1831,8 @@
* dependency is valid if it is from a rule in allowedRuledClasses, OR if all of the providers
* in requiredProviders are provided by the target.
*/
- private void validateRuleDependency(ConfiguredTarget prerequisite, Attribute attribute) {
+ private void validateRuleDependency(
+ ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
Set<String> unfulfilledRequirements = new LinkedHashSet<>();
if (checkRuleDependencyClass(prerequisite, attribute, unfulfilledRequirements)) {
@@ -1832,7 +1856,9 @@
/** Check if prerequisite should be allowed based on its rule class. */
private boolean checkRuleDependencyClass(
- ConfiguredTarget prerequisite, Attribute attribute, Set<String> unfulfilledRequirements) {
+ ConfiguredTargetAndTarget prerequisite,
+ Attribute attribute,
+ Set<String> unfulfilledRequirements) {
if (attribute.getAllowedRuleClassesPredicate() != Predicates.<RuleClass>alwaysTrue()) {
if (attribute
.getAllowedRuleClassesPredicate()
@@ -1858,7 +1884,7 @@
* <p>If yes, also issues said warning.
*/
private boolean checkRuleDependencyClassWarnings(
- ConfiguredTarget prerequisite, Attribute attribute) {
+ ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
if (attribute
.getAllowedRuleClassesWarningPredicate()
.apply(((Rule) prerequisite.getTarget()).getRuleClassObject())) {
@@ -1879,7 +1905,9 @@
/** Check if prerequisite should be allowed based on required providers on the attribute. */
private boolean checkRuleDependencyMandatoryProviders(
- ConfiguredTarget prerequisite, Attribute attribute, Set<String> unfulfilledRequirements) {
+ ConfiguredTargetAndTarget prerequisite,
+ Attribute attribute,
+ Set<String> unfulfilledRequirements) {
RequiredProviders requiredProviders = attribute.getRequiredProviders();
if (requiredProviders.acceptsAny()) {
@@ -1887,20 +1915,24 @@
return false;
}
- if (prerequisite.satisfies(requiredProviders)) {
+ if (prerequisite.getConfiguredTarget().satisfies(requiredProviders)) {
return true;
}
unfulfilledRequirements.add(
String.format(
"'%s' does not have mandatory providers: %s",
- prerequisite.getLabel(),
- prerequisite.missingProviders(requiredProviders).getDescription()));
+ prerequisite.getTarget().getLabel(),
+ prerequisite
+ .getConfiguredTarget()
+ .missingProviders(requiredProviders)
+ .getDescription()));
return false;
}
- private void validateDirectPrerequisite(Attribute attribute, ConfiguredTarget prerequisite) {
+ private void validateDirectPrerequisite(
+ Attribute attribute, ConfiguredTargetAndTarget prerequisite) {
validateDirectPrerequisiteType(prerequisite, attribute);
validateDirectPrerequisiteFileTypes(prerequisite, attribute);
if (attribute.performPrereqValidatorCheck()) {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java
index 85fd697..cd1fa08 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetContext.java
@@ -24,7 +24,9 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents;
import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
import java.util.List;
+import java.util.Set;
import javax.annotation.Nullable;
/**
@@ -46,7 +48,7 @@
* exception of visibility (i.e., visibility is represented here, even though it is a rule
* attribute in case of a rule). Rule attributes are handled by the {@link RuleContext} subclass.
*/
- private final List<ConfiguredTarget> directPrerequisites;
+ private final List<ConfiguredTargetAndTarget> directPrerequisites;
private final NestedSet<PackageGroupContents> visibility;
@@ -59,12 +61,12 @@
AnalysisEnvironment env,
Target target,
BuildConfiguration configuration,
- Iterable<ConfiguredTarget> directPrerequisites,
+ Set<ConfiguredTargetAndTarget> directPrerequisites,
NestedSet<PackageGroupContents> visibility) {
this.env = env;
this.target = target;
this.configuration = configuration;
- this.directPrerequisites = ImmutableList.<ConfiguredTarget>copyOf(directPrerequisites);
+ this.directPrerequisites = ImmutableList.copyOf(directPrerequisites);
this.visibility = visibility;
}
@@ -113,10 +115,10 @@
*/
public TransitiveInfoCollection maybeFindDirectPrerequisite(Label label,
BuildConfiguration config) {
- for (ConfiguredTarget prerequisite : directPrerequisites) {
- if (prerequisite.getLabel().equals(label)
- && (Objects.equal(prerequisite.getConfiguration(), config))) {
- return prerequisite;
+ for (ConfiguredTargetAndTarget prerequisite : directPrerequisites) {
+ if (prerequisite.getTarget().getLabel().equals(label)
+ && (Objects.equal(prerequisite.getConfiguredTarget().getConfiguration(), config))) {
+ return prerequisite.getConfiguredTarget();
}
}
return null;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java
index de1fc37..490462f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainContext.java
@@ -31,6 +31,7 @@
import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.packages.Attribute;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter;
@@ -111,7 +112,8 @@
return requiredToolchains;
}
- public void resolveToolchains(OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap) {
+ public void resolveToolchains(
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) {
if (!this.requiredToolchains.isEmpty()) {
this.resolvedToolchainProviders =
new ResolvedToolchainProviders(findToolchains(resolvedToolchainLabels, prerequisiteMap));
@@ -162,7 +164,7 @@
private static ImmutableMap<Label, ToolchainInfo> findToolchains(
ResolvedToolchainLabels resolvedToolchainLabels,
- OrderedSetMultimap<Attribute, ConfiguredTarget> prerequisiteMap) {
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) {
// Find the prerequisites associated with the $toolchains attribute.
Optional<Attribute> toolchainAttribute =
prerequisiteMap
@@ -176,11 +178,11 @@
"No toolchains attribute found while loading resolved toolchains");
ImmutableMap.Builder<Label, ToolchainInfo> toolchains = new ImmutableMap.Builder<>();
- for (ConfiguredTarget target : prerequisiteMap.get(toolchainAttribute.get())) {
- Label discoveredLabel = target.getLabel();
+ for (ConfiguredTargetAndTarget target : prerequisiteMap.get(toolchainAttribute.get())) {
+ Label discoveredLabel = target.getTarget().getLabel();
Label toolchainType = resolvedToolchainLabels.getType(discoveredLabel);
if (toolchainType != null) {
- ToolchainInfo toolchainInfo = PlatformProviderUtils.toolchain(target);
+ ToolchainInfo toolchainInfo = PlatformProviderUtils.toolchain(target.getConfiguredTarget());
toolchains.put(toolchainType, toolchainInfo);
}
}
