diff options
author | 2015-11-12 16:55:37 +0000 | |
---|---|---|
committer | 2015-11-13 10:19:58 +0000 | |
commit | 2c0c458837373edbac5597865ff3e43cfbe8751d (patch) | |
tree | 9a678190adeb4dabd3a04fdd8225e91e3f8b7ad8 /src/main/java/com/google/devtools/build | |
parent | ee0ade3ae1763cb0f9ed989e7692563a547f8559 (diff) |
Inline SkyframeBuildView.createAspect into its only call-site, to reduce stack depth.
--
MOS_MIGRATED_REVID=107688035
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | 5 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java | 28 |
2 files changed, 7 insertions, 26 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 1e301f5e6c..bc7bc6a851 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 @@ -224,13 +224,14 @@ public final class AspectFunction implements SkyFunction { } ConfiguredAspect configuredAspect = - view.createAspect( + view.getConfiguredTargetFactory().createAspect( analysisEnvironment, associatedTarget, aspectFactory, + key.getAspect(), directDeps, configConditions, - key.getAspect()); + view.getHostConfiguration(associatedTarget.getConfiguration())); events.replayOn(env.getListener()); if (events.hasErrors()) { diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java index b1d0faec8f..61c072835f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java @@ -32,18 +32,14 @@ import com.google.devtools.build.lib.actions.ArtifactOwner; import com.google.devtools.build.lib.actions.ArtifactPrefixConflictException; import com.google.devtools.build.lib.actions.MutableActionGraph; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; -import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.AnalysisFailureEvent; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.BuildView; import com.google.devtools.build.lib.analysis.CachingAnalysisEnvironment; -import com.google.devtools.build.lib.analysis.ConfiguredAspect; -import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.ConfiguredTargetFactory; import com.google.devtools.build.lib.analysis.LabelAndConfiguration; -import com.google.devtools.build.lib.analysis.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.ViewCreationFailedException; import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory; import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoKey; @@ -55,7 +51,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; -import com.google.devtools.build.lib.packages.Aspect; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.RuleClassProvider; @@ -148,6 +143,10 @@ public final class SkyframeBuildView { return ImmutableSet.copyOf(evaluatedConfiguredTargets); } + ConfiguredTargetFactory getConfiguredTargetFactory() { + return factory; + } + /** * Sets the configurations. Not thread-safe. DO NOT CALL except from tests! */ @@ -536,25 +535,6 @@ public final class SkyframeBuildView { } @Nullable - public ConfiguredAspect createAspect( - AnalysisEnvironment env, - RuleConfiguredTarget associatedTarget, - ConfiguredAspectFactory aspectFactory, - ListMultimap<Attribute, ConfiguredTarget> prerequisiteMap, - Set<ConfigMatchingProvider> configConditions, - Aspect aspect) - throws InterruptedException { - return factory.createAspect( - env, - associatedTarget, - aspectFactory, - aspect, - prerequisiteMap, - configConditions, - getHostConfiguration(associatedTarget.getConfiguration())); - } - - @Nullable SkyframeDependencyResolver createDependencyResolver(Environment env) { return new SkyframeDependencyResolver(env); } |