Move LoadingPhaseCompleteEvent posting to TargetPatternPhaseFunction

Also simplify LoadingPhaseCompleteEvent, and SkyframeExecutor, and remove
LoadingCallback, which is unnecessary now that we only have a single
implementation (previously LoadingPhaseRunner).

This also removes some of the excessive Skyframe calls introduced by
https://github.com/bazelbuild/bazel/commit/1067310e18cb9ac203110726de0be53bdc403cea, and prepares for interleaving target pattern eval and loading.

PiperOrigin-RevId: 205813197

1 files changed, 6 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
index 36ac9cfb77..2f3e9b2c5f 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/AnalysisPhaseRunner.java
@@ -45,7 +45,6 @@ import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.packages.TargetUtils;
-import com.google.devtools.build.lib.pkgcache.LoadingCallback;
 import com.google.devtools.build.lib.pkgcache.LoadingFailedException;
 import com.google.devtools.build.lib.pkgcache.LoadingResult;
 import com.google.devtools.build.lib.profiler.ProfilePhase;
@@ -185,19 +184,7 @@ public final class AnalysisPhaseRunner {
   private final LoadingResult evaluateTargetPatterns(
       final BuildRequest request, final TargetValidator validator)
       throws LoadingFailedException, TargetParsingException, InterruptedException {
-
-    final boolean keepGoing = request.getKeepGoing();
-
-    LoadingCallback callback =
-        new LoadingCallback() {
-          @Override
-          public void notifyTargets(Collection<Target> targets) throws LoadingFailedException {
-            if (validator != null) {
-              validator.validateTargets(targets, keepGoing);
-            }
-          }
-        };
-
+    boolean keepGoing = request.getKeepGoing();
     LoadingResult result =
         env.getSkyframeExecutor()
             .loadTargetPatterns(
@@ -206,8 +193,11 @@ public final class AnalysisPhaseRunner {
                 env.getRelativeWorkingDirectory(),
                 request.getLoadingOptions(),
                 keepGoing,
-                request.shouldRunTests(),
-                callback);
+                request.shouldRunTests());
+    if (validator != null) {
+      Collection<Target> targets = result.getTargets();
+      validator.validateTargets(targets, keepGoing);
+    }
     return result;
   }