Merge branch 'master' into 22404-getenv

Author: iancha1992

MODULE.bazel

@@ -35,7 +35,7 @@ bazel_dep(name = "with_cfg.bzl", version = "0.2.4")
 bazel_dep(name = "abseil-cpp", version = "20230125.1")
 
 # TODO(fmeum): Remove the dependency on buildozer after Bazel is built with 7.2.0.
-bazel_dep(name = "buildozer", version = "7.1.1.1")
+bazel_dep(name = "buildozer", version = "7.1.2")
 
 # TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR.
 bazel_dep(name = "remoteapis", version = "")

MODULE.bazel.lock

@@ -10,7 +10,7 @@ bazel_dep(name = "rules_license", version = "0.0.3")
 bazel_dep(name = "rules_proto", version = "4.0.0")
 bazel_dep(name = "rules_python", version = "0.22.1")
 
-bazel_dep(name = "buildozer", version = "7.1.1.1")
+bazel_dep(name = "buildozer", version = "7.1.2")
 bazel_dep(name = "platforms", version = "0.0.9")
 bazel_dep(name = "protobuf", version = "3.19.6", repo_name = "com_google_protobuf")
 bazel_dep(name = "zlib", version = "1.3")

src/MODULE.tools

@@ -30,6 +30,10 @@ public final class AliasProvider implements TransitiveInfoProvider {
   // We don't expect long alias chains, so it's better to have a list instead of a nested set
   private final ImmutableList<Label> aliasChain;
 
+  /** Singleton instance of {@link LateBoundAliasProvider}. */
+  public static final LateBoundAliasProvider LATE_BOUND_ALIAS_PROVIDER =
+      new LateBoundAliasProvider();
+
   private AliasProvider(ImmutableList<Label> aliasChain) {
     this.aliasChain = aliasChain;
   }
@@ -156,6 +160,18 @@ public static boolean mayBeAlias(Target target) {
     }
     AdvertisedProviderSet providerSet = rule.getRuleClassObject().getAdvertisedProviders();
     return providerSet.canHaveAnyProvider()
-        || providerSet.getBuiltinProviders().contains(AliasProvider.class);
+        || providerSet.getBuiltinProviders().contains(AliasProvider.class)
+        || providerSet.getBuiltinProviders().contains(LateBoundAliasProvider.class);
+  }
+
+  /**
+   * A provider to be advertised by {@link LateBoundAlias} rules.
+   *
+   * <p>This is a separate provider from {@link AliasProvider} because {@link LateBoundAlias} rules
+   * do not always create an {@link AliasProvider}.
+   */
+  @Immutable
+  public static final class LateBoundAliasProvider implements TransitiveInfoProvider {
+    private LateBoundAliasProvider() {}
   }
 }

src/main/java/com/google/devtools/build/lib/analysis/AliasProvider.java

@@ -77,7 +77,6 @@ java_library(
         ":config/transitions/composing_transition_factory",
         ":config/transitions/configuration_transition",
         ":config/transitions/no_transition",
-        ":config/transitions/null_transition",
         ":config/transitions/patch_transition",
         ":config/transitions/split_transition",
         ":config/transitions/transition_factory",
@@ -2021,6 +2020,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/events",
         "//src/main/java/com/google/devtools/build/lib/packages",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config:configuration_transition_api",
         "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/main/java/com/google/devtools/common/options",
@@ -2050,7 +2050,6 @@ java_library(
     deps = [
         ":config/transitions/configuration_transition",
         ":config/transitions/no_transition",
-        ":config/transitions/null_transition",
         ":config/transitions/split_transition",
         ":config/transitions/transition_factory",
         "//third_party:auto_value",
@@ -2119,7 +2118,6 @@ java_library(
         ":config/build_options",
         ":config/transitions/configuration_transition",
         ":config/transitions/no_transition",
-        ":config/transitions/null_transition",
         ":required_config_fragments_provider",
         "//src/main/java/com/google/devtools/build/lib/events",
         "//third_party:guava",
@@ -2133,7 +2131,6 @@ java_library(
         ":config/transitions/composing_transition",
         ":config/transitions/configuration_transition",
         ":config/transitions/no_transition",
-        ":config/transitions/null_transition",
         ":config/transitions/transition_factory",
         "//third_party:auto_value",
         "//third_party:guava",
@@ -2168,21 +2165,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config",
-        "//third_party:auto_value",
-    ],
-)
-
-java_library(
-    name = "config/transitions/null_transition",
-    srcs = ["config/transitions/NullTransition.java"],
-    deps = [
-        ":config/build_options",
-        ":config/transitions/configuration_transition",
-        ":config/transitions/patch_transition",
-        ":config/transitions/transition_factory",
-        "//src/main/java/com/google/devtools/build/lib/events",
-        "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
-        "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config:configuration_transition_api",
         "//third_party:auto_value",
     ],
 )
@@ -2603,6 +2586,7 @@ java_library(
         ":config/transitions/no_transition",
         "//src/main/java/com/google/devtools/build/lib/packages",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config",
+        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config:configuration_transition_api",
         "//src/main/java/net/starlark/java/eval",
     ],
 )

src/main/java/com/google/devtools/build/lib/analysis/BUILD

@@ -16,7 +16,6 @@
 import com.google.auto.value.AutoValue;
 import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.NoTransition;
-import com.google.devtools.build.lib.analysis.config.transitions.NullTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory;
 
@@ -33,8 +32,6 @@ public static <T extends TransitionFactory.Data> TransitionFactory<T> of(
       ConfigurationTransition transition) {
     if (transition instanceof NoTransition) {
       return NoTransition.createFactory();
-    } else if (transition instanceof NullTransition) {
-      return NullTransition.createFactory();
     } else if (transition instanceof SplitTransition splitTransition) {
       return split(splitTransition);
     }

src/main/java/com/google/devtools/build/lib/analysis/config/TransitionFactories.java

@@ -119,29 +119,17 @@ public static ConfigurationTransition of(
     Preconditions.checkNotNull(transition1);
     Preconditions.checkNotNull(transition2);
 
-    if (isFinal(transition1)) {
-      // Since no other transition can be composed with transition1, use it directly.
-      return transition1;
-    } else if (transition1 == NoTransition.INSTANCE) {
+    if (transition1 == NoTransition.INSTANCE) {
       // Since transition1 causes no changes, use transition2 directly.
       return transition2;
-    }
-
-    if (transition2 == NoTransition.INSTANCE) {
+    } else if (transition2 == NoTransition.INSTANCE) {
       // Since transition2 causes no changes, use transition 1 directly.
       return transition1;
-    } else if (isFinal(transition2)) {
-      // When the second transition is null, there's no need to compose.
-      return transition2;
     }
 
     return new ComposingTransition(transition1, transition2);
   }
 
-  private static boolean isFinal(ConfigurationTransition transition) {
-    return transition == NullTransition.INSTANCE;
-  }
-
   /**
    * Composes a new key out of two given keys. Composing two split transitions is not allowed at the
    * moment, so what this essentially does are (1) make sure not both transitions are split and (2)

src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingTransition.java

@@ -51,30 +51,17 @@ public static <T extends TransitionFactory.Data> TransitionFactory<T> of(
         !transitionFactory1.isSplit() || !transitionFactory2.isSplit(),
         "can't compose two split transition factories");
 
-    if (isFinal(transitionFactory1)) {
-      // Since no other transition can be composed with transitionFactory1, use it directly.
-      return transitionFactory1;
-    } else if (NoTransition.isInstance(transitionFactory1)) {
+    if (NoTransition.isInstance(transitionFactory1)) {
       // Since transitionFactory1 causes no changes, use transitionFactory2 directly.
       return transitionFactory2;
-    }
-
-    if (NoTransition.isInstance(transitionFactory2)) {
+    } else if (NoTransition.isInstance(transitionFactory2)) {
       // Since transitionFactory2 causes no changes, use transitionFactory1 directly.
       return transitionFactory1;
-    } else if (isFinal(transitionFactory2)) {
-      // When the second transition is null there's no need to compose.
-      return transitionFactory2;
     }
 
     return create(transitionFactory1, transitionFactory2);
   }
 
-  private static <T extends TransitionFactory.Data> boolean isFinal(
-      TransitionFactory<T> transitionFactory) {
-    return NullTransition.isInstance(transitionFactory);
-  }
-
   private static <T extends TransitionFactory.Data> TransitionFactory<T> create(
       TransitionFactory<T> transitionFactory1, TransitionFactory<T> transitionFactory2) {
     return new AutoValue_ComposingTransitionFactory<T>(transitionFactory1, transitionFactory2);