Use the same method as LoadedPackageProvider.Bridge to look up targets.

This unfortunately requires injecting an EventHandler into the
getTargetForLabel call, which is not super nice. On the other hand, it's not
clear how this can be much better - looking up targets in the cycle reporter
doesn't lend itself to prettiness.

--
MOS_MIGRATED_REVID=103965373

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java
index 9a77801348..c7a542f1ef 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetCycleReporter.java
@@ -17,7 +17,8 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider;
+import com.google.devtools.build.lib.events.EventHandler;
+import com.google.devtools.build.lib.pkgcache.PackageProvider;
 import com.google.devtools.build.skyframe.CycleInfo;
 import com.google.devtools.build.skyframe.SkyKey;
 
@@ -34,8 +35,8 @@ class ConfiguredTargetCycleReporter extends AbstractLabelCycleReporter {
   private static final Predicate<SkyKey> IS_CONFIGURED_TARGET_SKY_KEY =
       SkyFunctions.isSkyFunction(SkyFunctions.CONFIGURED_TARGET);
 
-  ConfiguredTargetCycleReporter(LoadedPackageProvider loadedPackageProvider) {
-    super(loadedPackageProvider);
+  ConfiguredTargetCycleReporter(PackageProvider packageProvider) {
+    super(packageProvider);
   }
 
   @Override
@@ -45,7 +46,8 @@ class ConfiguredTargetCycleReporter extends AbstractLabelCycleReporter {
   }
 
   @Override
-  protected String getAdditionalMessageAboutCycle(SkyKey topLevelKey, CycleInfo cycleInfo) {
+  protected String getAdditionalMessageAboutCycle(
+      EventHandler eventHandler, SkyKey topLevelKey, CycleInfo cycleInfo) {
     return "\nThis cycle occurred because of a configuration option";
   }