From fb831002e9398724feaa35e545cdf072007c95c8 Mon Sep 17 00:00:00 2001
From: Luca Di Grazia <luca.digrazia94@gmail.com>
Date: Sun, 4 Sep 2022 20:06:15 +0200
Subject: [PATCH]     Remove isTargetExplicit check -- now that filtering
 exists, only actual platform/toolchain targets will actually get into those
 lists.

    RELNOTES: None
    PiperOrigin-RevId: 241788572
---
 .../RegisteredExecutionPlatformsFunction.java | 30 +++++--------------
 .../RegisteredToolchainsFunction.java         | 28 -----------------
 2 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java
index d6b64bde211..9348cecf1d0 100644
--- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java
+++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java
@@ -14,8 +14,6 @@
 
 package com.google.devtools.build.lib.skyframe;
 
-import static com.google.common.base.Predicates.equalTo;
-import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 
 import com.google.auto.value.AutoValue;
@@ -94,8 +92,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
 
     // Load the configured target for each, and get the declared execution platforms providers.
     ImmutableList<ConfiguredTargetKey> registeredExecutionPlatformKeys =
-        configureRegisteredExecutionPlatforms(
-            env, configuration, configuration.trimConfigurationsRetroactively(), platformLabels);
+        configureRegisteredExecutionPlatforms(env, configuration, platformLabels);
     if (env.valuesMissing()) {
       return null;
     }
@@ -125,7 +122,6 @@ public static List<String> getWorkspaceExecutionPlatforms(Environment env)
   private ImmutableList<ConfiguredTargetKey> configureRegisteredExecutionPlatforms(
       Environment env,
       BuildConfiguration configuration,
-      boolean sanityCheckConfiguration,
       List<Label> labels)
       throws InterruptedException, RegisteredExecutionPlatformsFunctionException {
 
@@ -149,22 +145,6 @@ private ImmutableList<ConfiguredTargetKey> configureRegisteredExecutionPlatforms
         }
         ConfiguredTarget target =
             ((ConfiguredTargetValue) valueOrException.get()).getConfiguredTarget();
-        // This check is necessary because trimming for other rules assumes that platform resolution
-        // uses the platform fragment and _only_ the platform fragment. Without this check, it's
-        // possible another fragment could slip in without us realizing, and thus break this
-        // assumption.
-        if (sanityCheckConfiguration
-            && target.getConfigurationKey().getFragments().stream()
-                .anyMatch(not(equalTo(PlatformConfiguration.class)))) {
-          // Only the PlatformConfiguration fragment may be present on a platform rule in
-          // retroactive trimming mode.
-          throw new RegisteredExecutionPlatformsFunctionException(
-              new InvalidPlatformException(
-                  target.getLabel(),
-                  "has fragments other than PlatformConfiguration, "
-                      + "which is forbidden in retroactive trimming mode"),
-              Transience.PERSISTENT);
-        }
         PlatformInfo platformInfo = PlatformProviderUtils.platform(target);
         if (platformInfo == null) {
           throw new RegisteredExecutionPlatformsFunctionException(
@@ -235,9 +215,13 @@ public boolean shouldRetain(Target target, boolean explicit) {
         return true;
       }
 
-      // If the rule requires platforms or toolchain resolution, it can't be used as a platform.
+      // If the rule requires platforms, it can't be used as a platform.
       RuleClass ruleClass = target.getAssociatedRule().getRuleClassObject();
-      if (ruleClass == null || ruleClass.useToolchainResolution()) {
+      if (ruleClass == null) {
+        return false;
+      }
+
+      if (ruleClass.supportsPlatforms()) {
         return false;
       }
 
diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunction.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunction.java
index 58b39d7ae0e..69ac1b77acc 100644
--- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunction.java
+++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunction.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.skyframe;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static java.util.stream.Collectors.joining;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
@@ -146,31 +145,8 @@ private ImmutableList<DeclaredToolchainInfo> configureRegisteredToolchains(
           valuesMissing = true;
           continue;
         }
-
         ConfiguredTarget target =
             ((ConfiguredTargetValue) valueOrException.get()).getConfiguredTarget();
-        if (configuration.trimConfigurationsRetroactively()
-            && !target.getConfigurationKey().getFragments().isEmpty()) {
-          // No fragment may be present on a toolchain rule in retroactive trimming mode.
-          // This is because trimming expects that platform and toolchain resolution uses only
-          // the platform configuration. In theory, this means toolchains could use platforms, but
-          // the current expectation is that toolchains should not use anything at all, so better
-          // to go with the stricter expectation for now.
-          String extraFragmentDescription =
-              target.getConfigurationKey().getFragments().stream()
-                  .map(cl -> cl.getSimpleName())
-                  .collect(joining(","));
-
-          throw new RegisteredToolchainsFunctionException(
-              new InvalidToolchainLabelException(
-                  toolchainLabel,
-                  "this toolchain uses configuration, which is forbidden in retroactive trimming "
-                      + "mode: "
-                      + "extra fragments are ["
-                      + extraFragmentDescription
-                      + "]"),
-              Transience.PERSISTENT);
-        }
         DeclaredToolchainInfo toolchainInfo = target.getProvider(DeclaredToolchainInfo.class);
 
         if (toolchainInfo == null) {
@@ -209,10 +185,6 @@ public InvalidToolchainLabelException(Label invalidLabel) {
               "target does not provide the DeclaredToolchainInfo provider"));
     }
 
-    public InvalidToolchainLabelException(Label invalidLabel, String reason) {
-      super(formatMessage(invalidLabel.getCanonicalForm(), reason));
-    }
-
     public InvalidToolchainLabelException(TargetPatternUtil.InvalidTargetPatternException e) {
       this(e.getInvalidPattern(), e.getTpe());
     }