Remove direct store of Target from NoSuchTargetException. Instead, just note the fact that a valid Target exists, and instead request it directly from its Package.

--
MOS_MIGRATED_REVID=90107670

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
index 1abec5d635..a1c1968c35 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitor.java
@@ -121,6 +121,12 @@ final class SkyframeLabelVisitor implements TransitivePackageLoader {
       }
       warnAboutLoadingFailure(topLevelLabel, eventHandler);
       for (SkyKey badKey : errorInfo.getRootCauses()) {
+        if (badKey.functionName() == SkyFunctions.PACKAGE) {
+          // Transitive target function may ask for a Package, but don't include this in the root
+          // causes. We'll get more precise information from dependencies on transitive and direct
+          // target dependencies.
+          continue;
+        }
         Preconditions.checkState(badKey.argument() instanceof Label,
             "%s %s %s", key, errorInfo, badKey);
         rootCauses.put(topLevelLabel, (Label) badKey.argument());