Fix http://b/73496081 which was caused by not filtering on aliasconfiguredtargets that are actually ruleconfiguredtargets.

PiperOrigin-RevId: 185996274

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
index a694ab3f8c..8ff1716644 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java
@@ -52,6 +52,7 @@ import com.google.devtools.build.lib.query2.engine.QueryUtil.UniquifierImpl;
 import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback;
 import com.google.devtools.build.lib.query2.engine.Uniquifier;
 import com.google.devtools.build.lib.query2.output.QueryOptions;
+import com.google.devtools.build.lib.rules.AliasConfiguredTarget;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
 import com.google.devtools.build.lib.skyframe.GraphBackedRecursivePackageProvider;
@@ -375,9 +376,13 @@ public class ConfiguredTargetQueryEnvironment
   private Collection<ConfiguredTarget> filterFwdDeps(
       ConfiguredTarget configTarget, Collection<ConfiguredTarget> rawFwdDeps)
       throws InterruptedException {
-    if (!(configTarget instanceof RuleConfiguredTarget) || settings.isEmpty()) {
+    if (settings.isEmpty()) {
       return rawFwdDeps;
     }
+    if (configTarget instanceof AliasConfiguredTarget
+        && ((AliasConfiguredTarget) configTarget).getActual() instanceof RuleConfiguredTarget) {
+      return getAllowedDeps(((AliasConfiguredTarget) configTarget).getActual(), rawFwdDeps);
+    }
     return getAllowedDeps(configTarget, rawFwdDeps);
   }