Rename PackageManager.getTargetPatternEvaluator to newTargetPatternEval.

Also change the semantics to create a new one on every call; inject the offset
where we were previously relying on hidden state in the SkyframeExecutor.

--
MOS_MIGRATED_REVID=104188580

1 files changed, 2 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageManager.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageManager.java
index 5a389e481a..c4ea6e4982 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageManager.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageManager.java
@@ -44,7 +44,6 @@ class SkyframePackageManager implements PackageManager {
 
   private final SkyframePackageLoader packageLoader;
   private final SkyframeExecutor.SkyframeTransitivePackageLoader transitiveLoader;
-  private final TargetPatternEvaluator patternEvaluator;
   private final AtomicReference<UnixGlob.FilesystemCalls> syscalls;
   private final AtomicReference<CyclesReporter> skyframeCyclesReporter;
   private final AtomicReference<PathPackageLocator> pkgLocator;
@@ -53,7 +52,6 @@ class SkyframePackageManager implements PackageManager {
 
   public SkyframePackageManager(SkyframePackageLoader packageLoader,
       SkyframeExecutor.SkyframeTransitivePackageLoader transitiveLoader,
-      TargetPatternEvaluator patternEvaluator,
       AtomicReference<UnixGlob.FilesystemCalls> syscalls,
       AtomicReference<CyclesReporter> skyframeCyclesReporter,
       AtomicReference<PathPackageLocator> pkgLocator,
@@ -61,7 +59,6 @@ class SkyframePackageManager implements PackageManager {
       SkyframeExecutor skyframeExecutor) {
     this.packageLoader = packageLoader;
     this.transitiveLoader = transitiveLoader;
-    this.patternEvaluator = patternEvaluator;
     this.skyframeCyclesReporter = skyframeCyclesReporter;
     this.pkgLocator = pkgLocator;
     this.syscalls = syscalls;
@@ -142,7 +139,7 @@ class SkyframePackageManager implements PackageManager {
   }
 
   @Override
-  public TargetPatternEvaluator getTargetPatternEvaluator() {
-    return patternEvaluator;
+  public TargetPatternEvaluator newTargetPatternEvaluator() {
+    return new SkyframeTargetPatternEvaluator(skyframeExecutor);
   }
 }