Add BuildConfiguration to ConfiguredTargetAndTarget and rename it to ConfiguredTargetAndData. We want to get BuildConfiguration out of ConfiguredTarget because it uses >800K when serialized.
PiperOrigin-RevId: 188600002
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 e650ec5..ce3957e 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,7 +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;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
/**
* A provider that gives information about the aliases a rule was resolved through.
@@ -66,7 +66,7 @@
return aliasChain;
}
- public static String printLabelWithAliasChain(ConfiguredTargetAndTarget target) {
+ public static String printLabelWithAliasChain(ConfiguredTargetAndData target) {
AliasProvider aliasProvider = target.getConfiguredTarget().getProvider(AliasProvider.class);
String suffix = aliasProvider == null
? ""
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 79baad0..da80785 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,7 +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.ConfiguredTargetAndData;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
import com.google.devtools.build.lib.util.OrderedSetMultimap;
import com.google.devtools.build.skyframe.SkyFunction;
@@ -50,7 +50,7 @@
@Nullable
public static OrderedSetMultimap<Dependency, ConfiguredAspect> resolveAspectDependencies(
SkyFunction.Environment env,
- Map<SkyKey, ConfiguredTargetAndTarget> configuredTargetMap,
+ Map<SkyKey, ConfiguredTargetAndData> configuredTargetMap,
Iterable<Dependency> deps,
@Nullable NestedSetBuilder<Package> transitivePackages)
throws AspectFunction.AspectCreationException, InterruptedException {
@@ -90,7 +90,7 @@
}
// Validate that aspect is applicable to "bare" configured target.
- ConfiguredTargetAndTarget associatedTarget =
+ ConfiguredTargetAndData associatedTarget =
configuredTargetMap.get(
ConfiguredTargetValue.key(dep.getLabel(), dep.getConfiguration()));
if (!aspectMatchesConfiguredTarget(associatedTarget, aspectValue.getAspect())) {
@@ -115,17 +115,17 @@
* combinations of aspects for a particular configured target, so it would result in a
* combinatorial explosion of Skyframe nodes.
*/
- public static OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> mergeAspects(
+ public static OrderedSetMultimap<Attribute, ConfiguredTargetAndData> mergeAspects(
OrderedSetMultimap<Attribute, Dependency> depValueNames,
- Map<SkyKey, ConfiguredTargetAndTarget> depConfiguredTargetMap,
+ Map<SkyKey, ConfiguredTargetAndData> depConfiguredTargetMap,
OrderedSetMultimap<Dependency, ConfiguredAspect> depAspectMap)
throws MergedConfiguredTarget.DuplicateException {
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> result = OrderedSetMultimap.create();
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> result = OrderedSetMultimap.create();
for (Map.Entry<Attribute, Dependency> entry : depValueNames.entries()) {
Dependency dep = entry.getValue();
SkyKey depKey = ConfiguredTargetValue.key(dep.getLabel(), dep.getConfiguration());
- ConfiguredTargetAndTarget depConfiguredTarget = depConfiguredTargetMap.get(depKey);
+ ConfiguredTargetAndData depConfiguredTarget = depConfiguredTargetMap.get(depKey);
result.put(
entry.getKey(),
@@ -165,8 +165,7 @@
return aspectKey;
}
- public static boolean aspectMatchesConfiguredTarget(
- ConfiguredTargetAndTarget dep, Aspect aspect) {
+ public static boolean aspectMatchesConfiguredTarget(ConfiguredTargetAndData dep, Aspect aspect) {
if (!aspect.getDefinition().applyToFiles() && !(dep.getTarget() instanceof Rule)) {
return false;
}
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 ef8118f..8c4c28d 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
@@ -81,7 +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.ConfiguredTargetAndData;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.skyframe.CoverageReportValue;
import com.google.devtools.build.lib.skyframe.SkyframeAnalysisResult;
@@ -967,7 +967,7 @@
getDirectPrerequisiteDependenciesForTesting(
eventHandler, ct, configurations, /*toolchainContext=*/ null)
.values())),
- ConfiguredTargetAndTarget::getConfiguredTarget);
+ ConfiguredTargetAndData::getConfiguredTarget);
}
@VisibleForTesting
@@ -1080,7 +1080,7 @@
return ImmutableMap.copyOf(keys);
}
- private OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> getPrerequisiteMapForTesting(
+ private OrderedSetMultimap<Attribute, ConfiguredTargetAndData> getPrerequisiteMapForTesting(
final ExtendedEventHandler eventHandler,
ConfiguredTarget target,
BuildConfigurationCollection configurations,
@@ -1091,11 +1091,11 @@
getDirectPrerequisiteDependenciesForTesting(
eventHandler, target, configurations, toolchainContext);
- ImmutableMultimap<Dependency, ConfiguredTargetAndTarget> cts =
+ ImmutableMultimap<Dependency, ConfiguredTargetAndData> cts =
skyframeExecutor.getConfiguredTargetMapForTesting(
eventHandler, target.getConfiguration(), ImmutableSet.copyOf(depNodeNames.values()));
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> result = OrderedSetMultimap.create();
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> result = OrderedSetMultimap.create();
for (Map.Entry<Attribute, Dependency> entry : depNodeNames.entries()) {
result.putAll(entry.getKey(), cts.get(entry.getValue()));
}
@@ -1144,7 +1144,7 @@
}
@VisibleForTesting
- public ConfiguredTargetAndTarget getConfiguredTargetAndTargetForTesting(
+ public ConfiguredTargetAndData getConfiguredTargetAndTargetForTesting(
ExtendedEventHandler eventHandler, Label label, BuildConfiguration config) {
return skyframeExecutor.getConfiguredTargetAndTargetForTesting(eventHandler, label, config);
}
@@ -1200,7 +1200,7 @@
ToolchainContext toolchainContext =
skyframeExecutor.getToolchainContextForTesting(
requiredToolchains, targetConfig, eventHandler);
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap =
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap =
getPrerequisiteMapForTesting(
eventHandler, configuredTarget, configurations, toolchainContext);
toolchainContext.resolveToolchains(prerequisiteMap);
@@ -1239,11 +1239,11 @@
BuildConfigurationCollection configurations)
throws EvalException, InvalidConfigurationException, InterruptedException,
InconsistentAspectOrderException {
- Collection<ConfiguredTargetAndTarget> configuredTargets =
+ Collection<ConfiguredTargetAndData> configuredTargets =
getPrerequisiteMapForTesting(
eventHandler, dependentTarget, configurations, /*toolchainContext=*/ null)
.values();
- for (ConfiguredTargetAndTarget ct : configuredTargets) {
+ for (ConfiguredTargetAndData ct : configuredTargets) {
if (ct.getTarget().getLabel().equals(desiredTarget)) {
return ct.getConfiguredTarget();
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspectFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspectFactory.java
index 16159e3..18462fb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspectFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspectFactory.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.analysis;
import com.google.devtools.build.lib.packages.AspectParameters;
-import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndTarget;
+import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
/**
* Creates the Skyframe node of an aspect.
@@ -23,12 +23,12 @@
/**
* Creates the aspect based on the configured target of the associated rule.
*
- * @param ctatBase the ConfiguredTargetAndTarget of the associated rule
+ * @param ctadBase the ConfiguredTargetAndData of the associated rule
* @param context the context of the associated configured target plus all the attributes the
* aspect itself has defined
* @param parameters information from attributes of the rule that have requested this
*/
ConfiguredAspect create(
- ConfiguredTargetAndTarget ctatBase, RuleContext context, AspectParameters parameters)
+ ConfiguredTargetAndData ctadBase, RuleContext context, AspectParameters parameters)
throws InterruptedException;
}
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 2cd14da..c349b80 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,7 +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.skyframe.ConfiguredTargetAndData;
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;
@@ -93,7 +93,7 @@
*/
void validate(
RuleContext.Builder contextBuilder,
- ConfiguredTargetAndTarget prerequisite,
+ ConfiguredTargetAndData prerequisite,
Attribute attribute);
}
@@ -103,7 +103,7 @@
@Override
public void validate(
RuleContext.Builder contextBuilder,
- ConfiguredTargetAndTarget prerequisite,
+ ConfiguredTargetAndData prerequisite,
Attribute attribute) {
validateDirectPrerequisiteForDeprecation(
contextBuilder, contextBuilder.getRule(), prerequisite, contextBuilder.forAspect());
@@ -154,7 +154,7 @@
public static void validateDirectPrerequisiteForDeprecation(
RuleErrorConsumer errors,
Rule rule,
- ConfiguredTargetAndTarget prerequisite,
+ ConfiguredTargetAndData prerequisite,
boolean forAspect) {
Target prerequisiteTarget = prerequisite.getTarget();
Label prerequisiteLabel = prerequisiteTarget.getLabel();
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 f963a22..9647cb3 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
@@ -66,7 +66,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.ConfiguredTargetAndData;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
import com.google.devtools.build.lib.util.OrderedSetMultimap;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -100,7 +100,7 @@
* to the {@code AnalysisEnvironment}.
*/
private NestedSet<PackageGroupContents> convertVisibility(
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap,
EventHandler reporter,
Target target,
BuildConfiguration packageGroupConfiguration) {
@@ -148,10 +148,10 @@
}
private TransitiveInfoCollection findPrerequisite(
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap,
Label label,
BuildConfiguration config) {
- for (ConfiguredTargetAndTarget prerequisite : prerequisiteMap.get(null)) {
+ for (ConfiguredTargetAndData prerequisite : prerequisiteMap.get(null)) {
if (prerequisite.getTarget().getLabel().equals(label)
&& (prerequisite.getConfiguredTarget().getConfiguration() == config)) {
return prerequisite.getConfiguredTarget();
@@ -231,7 +231,7 @@
Target target,
BuildConfiguration config,
BuildConfiguration hostConfig,
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
@Nullable ToolchainContext toolchainContext)
throws InterruptedException, ActionConflictException {
@@ -305,7 +305,7 @@
Rule rule,
BuildConfiguration configuration,
BuildConfiguration hostConfiguration,
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
@Nullable ToolchainContext toolchainContext)
throws InterruptedException, ActionConflictException {
@@ -414,11 +414,11 @@
*/
public ConfiguredAspect createAspect(
AnalysisEnvironment env,
- ConfiguredTargetAndTarget associatedTarget,
+ ConfiguredTargetAndData associatedTarget,
ImmutableList<Aspect> aspectPath,
ConfiguredAspectFactory aspectFactory,
Aspect aspect,
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap,
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
@Nullable ToolchainContext toolchainContext,
BuildConfiguration aspectConfiguration,
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 075a0ab..3d0fbf0 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
@@ -89,7 +89,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.skyframe.ConfiguredTargetAndData;
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;
@@ -173,7 +173,7 @@
*/
private final ImmutableList<Aspect> aspects;
private final ImmutableList<AspectDescriptor> aspectDescriptors;
- private final ListMultimap<String, ConfiguredTargetAndTarget> targetMap;
+ private final ListMultimap<String, ConfiguredTargetAndData> targetMap;
private final ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap;
private final ImmutableMap<Label, ConfigMatchingProvider> configConditions;
private final AspectAwareAttributeMapper attributes;
@@ -195,7 +195,7 @@
private RuleContext(
Builder builder,
AttributeMap attributes,
- ListMultimap<String, ConfiguredTargetAndTarget> targetMap,
+ ListMultimap<String, ConfiguredTargetAndData> targetMap,
ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap,
ImmutableMap<Label, ConfigMatchingProvider> configConditions,
Class<? extends BuildConfiguration.Fragment> universalFragment,
@@ -372,14 +372,14 @@
* Returns an immutable map from attribute name to list of configured targets for that attribute.
*/
public ListMultimap<String, ? extends TransitiveInfoCollection> getConfiguredTargetMap() {
- return Multimaps.transformValues(targetMap, ConfiguredTargetAndTarget::getConfiguredTarget);
+ return Multimaps.transformValues(targetMap, ConfiguredTargetAndData::getConfiguredTarget);
}
private List<? extends TransitiveInfoCollection> getDeps(String key) {
- return Lists.transform(targetMap.get(key), ConfiguredTargetAndTarget::getConfiguredTarget);
+ return Lists.transform(targetMap.get(key), ConfiguredTargetAndData::getConfiguredTarget);
}
- private List<ConfiguredTargetAndTarget> getConfiguredTargetAndTargetDeps(String key) {
+ private List<ConfiguredTargetAndData> getConfiguredTargetAndTargetDeps(String key) {
return targetMap.get(key);
}
@@ -738,7 +738,7 @@
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 (ConfiguredTargetAndTarget dep : targetMap.get(attributeName)) {
+ for (ConfiguredTargetAndData dep : targetMap.get(attributeName)) {
labelToDep.put(dep.getTarget().getLabel(), dep.getConfiguredTarget());
}
@@ -758,7 +758,7 @@
Mode mode) {
return Lists.transform(
getPrerequisiteConfiguredTargetAndTargets(attributeName, mode),
- ConfiguredTargetAndTarget::getConfiguredTarget);
+ ConfiguredTargetAndData::getConfiguredTarget);
}
/**
@@ -769,7 +769,7 @@
getSplitPrerequisites(String attributeName) {
return Maps.transformValues(
getSplitPrerequisiteConfiguredTargetAndTargets(attributeName),
- (ctatList) -> Lists.transform(ctatList, ConfiguredTargetAndTarget::getConfiguredTarget));
+ (ctatList) -> Lists.transform(ctatList, ConfiguredTargetAndData::getConfiguredTarget));
}
/**
@@ -777,7 +777,7 @@
* attribute. Note that you need to specify the correct mode for the attribute otherwise an
* exception will be raised.
*/
- public List<ConfiguredTargetAndTarget> getPrerequisiteConfiguredTargetAndTargets(
+ public List<ConfiguredTargetAndData> getPrerequisiteConfiguredTargetAndTargets(
String attributeName, Mode mode) {
Attribute attributeDefinition = attributes().getAttributeDefinition(attributeName);
if ((mode == Mode.TARGET) && (attributeDefinition.hasSplitConfigurationTransition())) {
@@ -787,7 +787,7 @@
// deeply nested and we can't easily inject the behavior we want. However, we should fix all
// such call sites.
checkAttribute(attributeName, Mode.SPLIT);
- Map<Optional<String>, List<ConfiguredTargetAndTarget>> map =
+ Map<Optional<String>, List<ConfiguredTargetAndData>> map =
getSplitPrerequisiteConfiguredTargetAndTargets(attributeName);
return map.isEmpty() ? ImmutableList.of() : map.entrySet().iterator().next().getValue();
}
@@ -796,7 +796,7 @@
return getConfiguredTargetAndTargetDeps(attributeName);
}
- private Map<Optional<String>, List<ConfiguredTargetAndTarget>>
+ private Map<Optional<String>, List<ConfiguredTargetAndData>>
getSplitPrerequisiteConfiguredTargetAndTargets(String attributeName) {
checkAttribute(attributeName, Mode.SPLIT);
Attribute attributeDefinition = attributes().getAttributeDefinition(attributeName);
@@ -804,7 +804,7 @@
attributeDefinition.getSplitTransition(
ConfiguredAttributeMapper.of(rule, configConditions));
List<BuildOptions> splitOptions = transition.split(getConfiguration().getOptions());
- List<ConfiguredTargetAndTarget> deps = getConfiguredTargetAndTargetDeps(attributeName);
+ List<ConfiguredTargetAndData> deps = getConfiguredTargetAndTargetDeps(attributeName);
if (splitOptions.isEmpty()) {
// The split transition is not active. Defer the decision on which CPU to use.
@@ -819,9 +819,9 @@
}
// Use an ImmutableListMultimap.Builder here to preserve ordering.
- ImmutableListMultimap.Builder<Optional<String>, ConfiguredTargetAndTarget> result =
+ ImmutableListMultimap.Builder<Optional<String>, ConfiguredTargetAndData> result =
ImmutableListMultimap.builder();
- for (ConfiguredTargetAndTarget t : deps) {
+ for (ConfiguredTargetAndData t : deps) {
if (t.getConfiguredTarget().getConfiguration() != null) {
result.put(Optional.of(t.getConfiguredTarget().getConfiguration().getCpu()), t);
} else {
@@ -863,16 +863,16 @@
/**
* For a given attribute, returns all the ConfiguredTargetAndTargets of that attribute. Each
- * ConfiguredTargetAndTarget is keyed by the {@link BuildConfiguration} that created it.
+ * ConfiguredTargetAndData is keyed by the {@link BuildConfiguration} that created it.
*/
- public ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndTarget>
+ public ImmutableListMultimap<BuildConfiguration, ConfiguredTargetAndData>
getPrerequisiteCofiguredTargetAndTargetsByConfiguration(String attributeName, Mode mode) {
- List<ConfiguredTargetAndTarget> ctatCollection =
+ List<ConfiguredTargetAndData> ctatCollection =
getPrerequisiteConfiguredTargetAndTargets(attributeName, mode);
- ImmutableListMultimap.Builder<BuildConfiguration, ConfiguredTargetAndTarget> result =
+ ImmutableListMultimap.Builder<BuildConfiguration, ConfiguredTargetAndData> result =
ImmutableListMultimap.builder();
- for (ConfiguredTargetAndTarget ctat : ctatCollection) {
- result.put(ctat.getConfiguredTarget().getConfiguration(), ctat);
+ for (ConfiguredTargetAndData ctad : ctatCollection) {
+ result.put(ctad.getConfiguredTarget().getConfiguration(), ctad);
}
return result.build();
}
@@ -1395,7 +1395,7 @@
private PatchTransition disableLipoTransition;
private final PrerequisiteValidator prerequisiteValidator;
private final ErrorReporter reporter;
- private OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap;
+ private OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap;
private ImmutableMap<Label, ConfigMatchingProvider> configConditions;
private NestedSet<PackageGroupContents> visibility;
private ImmutableMap<String, Attribute> aspectAttributes;
@@ -1428,7 +1428,7 @@
Preconditions.checkNotNull(visibility);
AttributeMap attributes = ConfiguredAttributeMapper.of(rule, configConditions);
validateAttributes(attributes);
- ListMultimap<String, ConfiguredTargetAndTarget> targetMap = createTargetMap();
+ ListMultimap<String, ConfiguredTargetAndData> targetMap = createTargetMap();
ListMultimap<String, ConfiguredFilesetEntry> filesetEntryMap =
createFilesetEntryMap(rule, configConditions);
return new RuleContext(
@@ -1457,7 +1457,7 @@
* warning messages and sets the error flag as appropriate.
*/
Builder setPrerequisites(
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) {
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap) {
this.prerequisiteMap = Preconditions.checkNotNull(prerequisiteMap);
return this;
}
@@ -1506,7 +1506,7 @@
return this;
}
- private boolean validateFilesetEntry(FilesetEntry filesetEntry, ConfiguredTargetAndTarget src) {
+ private boolean validateFilesetEntry(FilesetEntry filesetEntry, ConfiguredTargetAndData src) {
if (src.getConfiguredTarget().getProvider(FilesetProvider.class) != null) {
return true;
}
@@ -1544,8 +1544,8 @@
continue;
}
String attributeName = attr.getName();
- Map<Label, ConfiguredTargetAndTarget> ctMap = new HashMap<>();
- for (ConfiguredTargetAndTarget prerequisite : prerequisiteMap.get(attr)) {
+ Map<Label, ConfiguredTargetAndData> ctMap = new HashMap<>();
+ for (ConfiguredTargetAndData prerequisite : prerequisiteMap.get(attr)) {
ctMap.put(
AliasProvider.getDependencyLabel(prerequisite.getConfiguredTarget()), prerequisite);
}
@@ -1554,7 +1554,7 @@
for (FilesetEntry entry : entries) {
if (entry.getFiles() == null) {
Label label = entry.getSrcLabel();
- ConfiguredTargetAndTarget src = ctMap.get(label);
+ ConfiguredTargetAndData src = ctMap.get(label);
if (!validateFilesetEntry(entry, src)) {
continue;
}
@@ -1574,11 +1574,11 @@
}
/** Determines and returns a map from attribute name to list of configured targets. */
- private ImmutableSortedKeyListMultimap<String, ConfiguredTargetAndTarget> createTargetMap() {
- ImmutableSortedKeyListMultimap.Builder<String, ConfiguredTargetAndTarget> mapBuilder =
+ private ImmutableSortedKeyListMultimap<String, ConfiguredTargetAndData> createTargetMap() {
+ ImmutableSortedKeyListMultimap.Builder<String, ConfiguredTargetAndData> mapBuilder =
ImmutableSortedKeyListMultimap.builder();
- for (Map.Entry<Attribute, Collection<ConfiguredTargetAndTarget>> entry :
+ for (Map.Entry<Attribute, Collection<ConfiguredTargetAndData>> entry :
prerequisiteMap.asMap().entrySet()) {
Attribute attribute = entry.getKey();
if (attribute == null) {
@@ -1592,7 +1592,7 @@
if (attribute.isSilentRuleClassFilter()) {
Predicate<RuleClass> filter = attribute.getAllowedRuleClassesPredicate();
- for (ConfiguredTargetAndTarget configuredTarget : entry.getValue()) {
+ for (ConfiguredTargetAndData configuredTarget : entry.getValue()) {
Target prerequisiteTarget = configuredTarget.getTarget();
if ((prerequisiteTarget instanceof Rule)
&& filter.apply(((Rule) prerequisiteTarget).getRuleClassObject())) {
@@ -1601,7 +1601,7 @@
}
}
} else {
- for (ConfiguredTargetAndTarget configuredTarget : entry.getValue()) {
+ for (ConfiguredTargetAndData configuredTarget : entry.getValue()) {
validateDirectPrerequisite(attribute, configuredTarget);
mapBuilder.put(attribute.getName(), configuredTarget);
}
@@ -1664,10 +1664,7 @@
}
private String badPrerequisiteMessage(
- String targetKind,
- ConfiguredTargetAndTarget prerequisite,
- String reason,
- boolean isWarning) {
+ String targetKind, ConfiguredTargetAndData prerequisite, String reason, boolean isWarning) {
String msgPrefix = targetKind != null ? targetKind + " " : "";
String msgReason = reason != null ? " (" + reason + ")" : "";
if (isWarning) {
@@ -1683,7 +1680,7 @@
private void reportBadPrerequisite(
Attribute attribute,
String targetKind,
- ConfiguredTargetAndTarget prerequisite,
+ ConfiguredTargetAndData prerequisite,
String reason,
boolean isWarning) {
String message = badPrerequisiteMessage(targetKind, prerequisite, reason, isWarning);
@@ -1695,7 +1692,7 @@
}
private void validateDirectPrerequisiteType(
- ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
+ ConfiguredTargetAndData prerequisite, Attribute attribute) {
Target prerequisiteTarget = prerequisite.getTarget();
Label prerequisiteLabel = prerequisiteTarget.getLabel();
@@ -1778,7 +1775,7 @@
}
private void validateDirectPrerequisiteFileTypes(
- ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
+ ConfiguredTargetAndData prerequisite, Attribute attribute) {
if (attribute.isSkipAnalysisTimeFileTypeCheck()) {
return;
}
@@ -1830,8 +1827,7 @@
* 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(
- ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
+ private void validateRuleDependency(ConfiguredTargetAndData prerequisite, Attribute attribute) {
Set<String> unfulfilledRequirements = new LinkedHashSet<>();
if (checkRuleDependencyClass(prerequisite, attribute, unfulfilledRequirements)) {
@@ -1855,7 +1851,7 @@
/** Check if prerequisite should be allowed based on its rule class. */
private boolean checkRuleDependencyClass(
- ConfiguredTargetAndTarget prerequisite,
+ ConfiguredTargetAndData prerequisite,
Attribute attribute,
Set<String> unfulfilledRequirements) {
if (attribute.getAllowedRuleClassesPredicate() != Predicates.<RuleClass>alwaysTrue()) {
@@ -1883,7 +1879,7 @@
* <p>If yes, also issues said warning.
*/
private boolean checkRuleDependencyClassWarnings(
- ConfiguredTargetAndTarget prerequisite, Attribute attribute) {
+ ConfiguredTargetAndData prerequisite, Attribute attribute) {
if (attribute
.getAllowedRuleClassesWarningPredicate()
.apply(((Rule) prerequisite.getTarget()).getRuleClassObject())) {
@@ -1904,7 +1900,7 @@
/** Check if prerequisite should be allowed based on required providers on the attribute. */
private boolean checkRuleDependencyMandatoryProviders(
- ConfiguredTargetAndTarget prerequisite,
+ ConfiguredTargetAndData prerequisite,
Attribute attribute,
Set<String> unfulfilledRequirements) {
RequiredProviders requiredProviders = attribute.getRequiredProviders();
@@ -1931,7 +1927,7 @@
}
private void validateDirectPrerequisite(
- Attribute attribute, ConfiguredTargetAndTarget prerequisite) {
+ Attribute attribute, ConfiguredTargetAndData 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 cd1fa08..4f55484 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,7 @@
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 com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
@@ -48,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<ConfiguredTargetAndTarget> directPrerequisites;
+ private final List<ConfiguredTargetAndData> directPrerequisites;
private final NestedSet<PackageGroupContents> visibility;
@@ -61,7 +61,7 @@
AnalysisEnvironment env,
Target target,
BuildConfiguration configuration,
- Set<ConfiguredTargetAndTarget> directPrerequisites,
+ Set<ConfiguredTargetAndData> directPrerequisites,
NestedSet<PackageGroupContents> visibility) {
this.env = env;
this.target = target;
@@ -115,7 +115,7 @@
*/
public TransitiveInfoCollection maybeFindDirectPrerequisite(Label label,
BuildConfiguration config) {
- for (ConfiguredTargetAndTarget prerequisite : directPrerequisites) {
+ for (ConfiguredTargetAndData prerequisite : directPrerequisites) {
if (prerequisite.getTarget().getLabel().equals(label)
&& (Objects.equal(prerequisite.getConfiguredTarget().getConfiguration(), config))) {
return prerequisite.getConfiguredTarget();
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 490462f..a2e63b9 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,7 +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.skyframe.ConfiguredTargetAndData;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter;
@@ -113,7 +113,7 @@
}
public void resolveToolchains(
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) {
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap) {
if (!this.requiredToolchains.isEmpty()) {
this.resolvedToolchainProviders =
new ResolvedToolchainProviders(findToolchains(resolvedToolchainLabels, prerequisiteMap));
@@ -164,7 +164,7 @@
private static ImmutableMap<Label, ToolchainInfo> findToolchains(
ResolvedToolchainLabels resolvedToolchainLabels,
- OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> prerequisiteMap) {
+ OrderedSetMultimap<Attribute, ConfiguredTargetAndData> prerequisiteMap) {
// Find the prerequisites associated with the $toolchains attribute.
Optional<Attribute> toolchainAttribute =
prerequisiteMap
@@ -178,7 +178,7 @@
"No toolchains attribute found while loading resolved toolchains");
ImmutableMap.Builder<Label, ToolchainInfo> toolchains = new ImmutableMap.Builder<>();
- for (ConfiguredTargetAndTarget target : prerequisiteMap.get(toolchainAttribute.get())) {
+ for (ConfiguredTargetAndData target : prerequisiteMap.get(toolchainAttribute.get())) {
Label discoveredLabel = target.getTarget().getLabel();
Label toolchainType = resolvedToolchainLabels.getType(discoveredLabel);
if (toolchainType != null) {
