Narrow InconsistentAspectOrderException dependencies.

Depend on Label and Locaton instead of Target which won't be available in distributed contexts. PiperOrigin-RevId: 496474302 Change-Id: I9dd737fb040be321c2946db72dc38c8b6c70c24b
bazelbuild · Dec 19, 2022 · 8017ce6 · 8017ce6
1 parent d2c85db
commit 8017ce6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -834,7 +834,7 @@ java_library(
     srcs = ["InconsistentAspectOrderException.java"],
     deps = [
         ":aspect_collection",
-        "//src/main/java/com/google/devtools/build/lib/packages",
+        "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/net/starlark/java/syntax",
     ],
 )

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
@@ -785,7 +785,7 @@ private static AspectCollection computeAspectCollections(
     try {
       return AspectCollection.create(filteredAspectPath);
     } catch (AspectCycleOnPathException e) {
-      throw new InconsistentAspectOrderException(toTarget, e);
+      throw new InconsistentAspectOrderException(toTarget.getLabel(), toTarget.getLocation(), e);
     }
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/InconsistentAspectOrderException.java b/src/main/java/com/google/devtools/build/lib/analysis/InconsistentAspectOrderException.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.analysis;
 
 import com.google.devtools.build.lib.analysis.AspectCollection.AspectCycleOnPathException;
-import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.cmdline.Label;
 import net.starlark.java.syntax.Location;
 
 /**
@@ -26,9 +26,10 @@
 public class InconsistentAspectOrderException extends Exception {
   private final Location location;
 
-  public InconsistentAspectOrderException(Target target, AspectCycleOnPathException e) {
-    super(String.format("%s (when propagating to %s)", e.getMessage(), target.getLabel()));
-    this.location = target.getLocation();
+  public InconsistentAspectOrderException(
+      Label targetLabel, Location location, AspectCycleOnPathException e) {
+    super(String.format("%s (when propagating to %s)", e.getMessage(), targetLabel));
+    this.location = location;
   }
 
   public Location getLocation() {