Inline SkyframeBuildView.createAspect into its only call-site, to reduce stack depth.

--
MOS_MIGRATED_REVID=107688035

1 files changed, 4 insertions, 24 deletions

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);
   }