From fbeb09d518e81e92113a2663c6c975fa598b9d50 Mon Sep 17 00:00:00 2001
From: Ulf Adams <ulfjack@google.com>
Date: Fri, 25 Sep 2015 21:16:42 +0000
Subject: Make explicit that the SkyframeTransitivePackageLoader needs an
 EventHandler.

--
MOS_MIGRATED_REVID=103975222
---
 .../devtools/build/lib/skyframe/SkyframeExecutor.java      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/google')

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 38748a9f6e..07272529d9 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -279,7 +279,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     this.tsgm = tsgm;
     this.workspaceStatusActionFactory = workspaceStatusActionFactory;
     this.packageManager = new SkyframePackageManager(
-        new SkyframePackageLoader(), new SkyframeTransitivePackageLoader(),
+        new SkyframePackageLoader(), new SkyframeTransitivePackageLoader(reporter),
         new SkyframeTargetPatternEvaluator(this), syscalls, cyclesReporter, pkgLocator,
         numPackagesLoaded, this);
     this.errorEventListener = Preconditions.checkNotNull(reporter);
@@ -1361,10 +1361,17 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   @VisibleForTesting
   public TransitivePackageLoader pkgLoader() {
     checkActive();
-    return new SkyframeLabelVisitor(new SkyframeTransitivePackageLoader(), cyclesReporter);
+    return new SkyframeLabelVisitor(
+        new SkyframeTransitivePackageLoader(errorEventListener), cyclesReporter);
   }
 
   class SkyframeTransitivePackageLoader {
+    private final EventHandler eventHandler;
+
+    SkyframeTransitivePackageLoader(EventHandler eventHandler) {
+      this.eventHandler = eventHandler;
+    }
+
     /**
      * Loads the specified {@link TransitiveTargetValue}s.
      */
@@ -1399,7 +1406,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
                         valueNames,
                         false,
                         ResourceUsage.getAvailableProcessors(),
-                        errorEventListener);
+                        eventHandler);
                 Preconditions.checkState(
                     !result.hasError(), "unexpected errors: %s", result.errorMap());
                 Set<Package> packages = Sets.newHashSet();
@@ -1414,7 +1421,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
       } catch (Exception e) {
         throw new IllegalStateException(e);
       }
-
     }
   }
 
-- 
cgit v1.2.3