Add filter in cquery/aquery to skip targets with mismatched configurations.

PiperOrigin-RevId: 542432271
Change-Id: Idad6ff6e333b8fd1c6f18858b9544a36c10ce659

Author: aoeui

src/main/java/com/google/devtools/build/lib/query2/aquery/ActionGraphQueryEnvironment.java

@@ -51,6 +51,7 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
@@ -194,7 +195,15 @@ public Label getCorrectLabel(ConfiguredTargetValue configuredTargetValue) {
   @Nullable
   private ConfiguredTargetValue createConfiguredTargetValueFromKey(ConfiguredTargetKey key)
       throws InterruptedException {
-    return getConfiguredTargetValue(key.toKey());
+    ConfiguredTargetValue value = getConfiguredTargetValue(key.toKey());
+    if (value == null
+        || !Objects.equals(
+            value.getConfiguredTarget().getConfigurationKey(), key.getConfigurationKey())) {
+      // The configurations might not match if the target's configuration changed due to a
+      // transition or trimming. Filters such targets.
+      return null;
+    }
+    return value;
   }
 
   @Nullable
@@ -235,7 +244,7 @@ protected ConfiguredTargetValue getNullConfiguredTarget(Label label) throws Inte
   @Override
   protected ConfiguredTargetValue getValueFromKey(SkyKey key) throws InterruptedException {
     Preconditions.checkState(key instanceof ConfiguredTargetKey);
-    return createConfiguredTargetValueFromKey((ConfiguredTargetKey) key);
+    return getConfiguredTargetValue(((ConfiguredTargetKey) key).toKey());
   }
 
   @Nullable
@@ -335,6 +344,6 @@ public void setActionFilters(AqueryActionFilter actionFilters) {
   }
 
   private static ConfiguredTargetKey getConfiguredTargetKeyImpl(ConfiguredTargetValue targetValue) {
-    return (ConfiguredTargetKey) targetValue.getConfiguredTarget().getKeyOrProxy();
+    return ConfiguredTargetKey.fromConfiguredTarget(targetValue.getConfiguredTarget());
   }
 }

src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQueryEnvironment.java

@@ -49,6 +49,7 @@
 import com.google.devtools.build.lib.query2.query.aspectresolvers.AspectResolver;
 import com.google.devtools.build.lib.rules.AliasConfiguredTarget;
 import com.google.devtools.build.lib.server.FailureDetails.ConfigurableQuery;
+import com.google.devtools.build.lib.skyframe.BuildConfigurationKey;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
 import com.google.devtools.build.skyframe.SkyKey;
@@ -59,6 +60,7 @@
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -339,14 +341,22 @@ public QueryTaskFuture<Void> getTargetsMatchingPattern(
    * null.
    */
   @Nullable
-  private ConfiguredTarget getConfiguredTarget(Label label, BuildConfigurationValue configuration)
-      throws InterruptedException {
-    return getValueFromKey(
-        ConfiguredTargetKey.builder()
-            .setLabel(label)
-            .setConfiguration(configuration)
-            .build()
-            .toKey());
+  private ConfiguredTarget getConfiguredTarget(
+      Label label, @Nullable BuildConfigurationValue configuration) throws InterruptedException {
+    BuildConfigurationKey configurationKey = configuration == null ? null : configuration.getKey();
+    ConfiguredTarget target =
+        getValueFromKey(
+            ConfiguredTargetKey.builder()
+                .setLabel(label)
+                .setConfigurationKey(configurationKey)
+                .build()
+                .toKey());
+    // The configurations might not match if the target's configuration changed due to a transition
+    // or trimming. Filters such targets.
+    if (target == null || !Objects.equals(configurationKey, target.getConfigurationKey())) {
+      return null;
+    }
+    return target;
   }
 
   @Override