Move loadingPhaseRunner from BlazeRuntime to CommandEnvironment.

The loadingPhaseRunner is stateless, and moving it prevents accidentally
adding state to it. The TargetPatternEvaluator is not stateless, but is
currently retained by the SkyframePackageManager, so we still keep that state
across invocations (see follow-up CL).

--
MOS_MIGRATED_REVID=104187659

1 files changed, 1 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 026b2cf3e7..d33434bd46 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -57,10 +57,8 @@ import com.google.devtools.build.lib.exec.OutputService;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.Preprocessor;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
-import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner;
 import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
 import com.google.devtools.build.lib.pkgcache.PackageManager;
-import com.google.devtools.build.lib.pkgcache.TargetPatternEvaluator;
 import com.google.devtools.build.lib.profiler.AutoProfiler;
 import com.google.devtools.build.lib.profiler.MemoryProfiler;
 import com.google.devtools.build.lib.profiler.ProfilePhase;
@@ -171,7 +169,6 @@ public final class BlazeRuntime {
 
   // Always null in production! Only non-null when tests inject a custom reporter.
   private final Reporter reporter;
-  private final LoadingPhaseRunner loadingPhaseRunner;
   private final PackageFactory packageFactory;
   private final ConfigurationFactory configurationFactory;
   private final ConfiguredRuleClassProvider ruleClassProvider;
@@ -217,9 +214,6 @@ public final class BlazeRuntime {
     this.projectFileProvider = projectFileProvider;
 
     this.skyframeExecutor = skyframeExecutor;
-    this.loadingPhaseRunner = new LoadingPhaseRunner(
-        skyframeExecutor.getPackageManager(),
-        pkgFactory.getRuleClassNames());
 
     this.blazeModules = blazeModules;
     this.ruleClassProvider = ruleClassProvider;
@@ -532,10 +526,6 @@ public final class BlazeRuntime {
     return ruleClassProvider;
   }
 
-  public LoadingPhaseRunner getLoadingPhaseRunner() {
-    return loadingPhaseRunner;
-  }
-
   public Iterable<BlazeModule> getBlazeModules() {
     return blazeModules;
   }
@@ -556,13 +546,6 @@ public final class BlazeRuntime {
   }
 
   /**
-   * Returns the target pattern parser.
-   */
-  public TargetPatternEvaluator getTargetPatternEvaluator() {
-    return loadingPhaseRunner.getTargetPatternEvaluator();
-  }
-
-  /**
    * Returns reference to the lazily instantiated persistent action cache
    * instance. Note, that method may recreate instance between different build
    * requests, so return value should not be cached.
@@ -679,7 +662,7 @@ public final class BlazeRuntime {
       workspace = FileSystemUtils.getWorkingDirectory(directories.getFileSystem());
       workingDirectory = workspace;
     }
-    loadingPhaseRunner.updatePatternEvaluator(workingDirectory.relativeTo(workspace));
+    env.getLoadingPhaseRunner().updatePatternEvaluator(workingDirectory.relativeTo(workspace));
 
     env.updateClientEnv(options.clientEnv, options.ignoreClientEnv);