diff options
author | 2018-03-10 06:48:59 -0800 | |
---|---|---|
committer | 2018-03-10 06:50:28 -0800 | |
commit | 9c101404519d91db8e8dec09f9a9495eb8352f58 (patch) | |
tree | d2689acedd5ce2474ea89089aa8651be00c6a485 /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | |
parent | 50f99d56bb710f01524bd3f04882dada16a792c3 (diff) |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java index 54a0a370ad..917dfcb9dd 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java @@ -260,15 +260,17 @@ public final class AspectFunction implements SkyFunction { ConfiguredTarget associatedTarget = baseConfiguredTargetValue.getConfiguredTarget(); - ConfiguredTargetAndTarget associatedConfiguredTargetAndTarget; + ConfiguredTargetAndData associatedConfiguredTargetAndData; Package targetPkg = ((PackageValue) env.getValue(PackageValue.key(associatedTarget.getLabel().getPackageIdentifier()))) .getPackage(); try { - associatedConfiguredTargetAndTarget = - new ConfiguredTargetAndTarget( - associatedTarget, targetPkg.getTarget(associatedTarget.getLabel().getName())); + associatedConfiguredTargetAndData = + new ConfiguredTargetAndData( + associatedTarget, + targetPkg.getTarget(associatedTarget.getLabel().getName()), + associatedTarget.getConfiguration()); } catch (NoSuchTargetException e) { throw new IllegalStateException("Name already verified", e); } @@ -276,7 +278,7 @@ public final class AspectFunction implements SkyFunction { if (baseConfiguredTargetValue.getConfiguredTarget().getProvider(AliasProvider.class) != null) { return createAliasAspect( env, - associatedConfiguredTargetAndTarget.getTarget(), + associatedConfiguredTargetAndData.getTarget(), aspect, key, baseConfiguredTargetValue.getConfiguredTarget()); @@ -307,14 +309,14 @@ public final class AspectFunction implements SkyFunction { env.getListener() .handle( Event.error( - associatedConfiguredTargetAndTarget.getTarget().getLocation(), e.getMessage())); + associatedConfiguredTargetAndData.getTarget().getLocation(), e.getMessage())); throw new AspectFunctionException( new AspectCreationException(e.getMessage(), associatedTarget.getLabel())); } } - associatedConfiguredTargetAndTarget = - associatedConfiguredTargetAndTarget.fromConfiguredTarget(associatedTarget); + associatedConfiguredTargetAndData = + associatedConfiguredTargetAndData.fromConfiguredTarget(associatedTarget); aspectPathBuilder.add(aspect); SkyframeDependencyResolver resolver = view.createDependencyResolver(env); @@ -329,13 +331,13 @@ public final class AspectFunction implements SkyFunction { // will be present this way. TargetAndConfiguration originalTargetAndAspectConfiguration = new TargetAndConfiguration( - associatedConfiguredTargetAndTarget.getTarget(), aspectConfiguration); + associatedConfiguredTargetAndData.getTarget(), aspectConfiguration); ImmutableList<Aspect> aspectPath = aspectPathBuilder.build(); try { // Get the configuration targets that trigger this rule's configurable attributes. ImmutableMap<Label, ConfigMatchingProvider> configConditions = ConfiguredTargetFunction.getConfigConditions( - associatedConfiguredTargetAndTarget.getTarget(), + associatedConfiguredTargetAndData.getTarget(), env, resolver, originalTargetAndAspectConfiguration, @@ -356,7 +358,7 @@ public final class AspectFunction implements SkyFunction { String.format( "aspect %s applied to %s", aspect.getDescriptor().getDescription(), - associatedConfiguredTargetAndTarget.getTarget().toString()), + associatedConfiguredTargetAndData.getTarget().toString()), requiredToolchains, key.getAspectConfigurationKey()); } catch (ToolchainContextException e) { @@ -367,7 +369,7 @@ public final class AspectFunction implements SkyFunction { return null; } - OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> depValueMap; + OrderedSetMultimap<Attribute, ConfiguredTargetAndData> depValueMap; try { depValueMap = ConfiguredTargetFunction.computeDependencies( @@ -398,7 +400,7 @@ public final class AspectFunction implements SkyFunction { aspectPath, aspect, aspectFactory, - associatedConfiguredTargetAndTarget, + associatedConfiguredTargetAndData, aspectConfiguration, configConditions, toolchainContext, @@ -523,11 +525,11 @@ public final class AspectFunction implements SkyFunction { ImmutableList<Aspect> aspectPath, Aspect aspect, ConfiguredAspectFactory aspectFactory, - ConfiguredTargetAndTarget associatedTarget, + ConfiguredTargetAndData associatedTarget, BuildConfiguration aspectConfiguration, ImmutableMap<Label, ConfigMatchingProvider> configConditions, ToolchainContext toolchainContext, - OrderedSetMultimap<Attribute, ConfiguredTargetAndTarget> directDeps, + OrderedSetMultimap<Attribute, ConfiguredTargetAndData> directDeps, @Nullable NestedSetBuilder<Package> transitivePackagesForPackageRootResolution) throws AspectFunctionException, InterruptedException { |