Add --incompatible_use_toolchain_providers_in_java_common

Which requires passing JavaToolchainInfo and JavaRuntimeInfo providers to
java_common APIs instead of configured targets.

See: #7186

RELNOTES: incompatible_use_toolchain_providers_in_java_common: pass JavaToolchainInfo and JavaRuntimeInfo providers to java_common APIs instead of configured targets (#7186)
PiperOrigin-RevId: 231169120

src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java

@@ -504,6 +504,20 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable
   )
   public boolean internalSkylarkFlagTestCanary;
 
+  @Option(
+      name = "incompatible_use_toolchain_providers_in_java_common",
+      defaultValue = "false",
+      documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+      effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
+      metadataTags = {
+        OptionMetadataTag.INCOMPATIBLE_CHANGE,
+        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+      },
+      help =
+          "If set to true, java_common APIs that take a java_toolchain or host_javabase parameter "
+              + " require a JavaTootoolchainInfo or JavaRuntimeInfo instead of a configured"
+              + " target.")
+  public boolean incompatibleUseToolchainProvidersInJavaCommon;
 
   /** Constructs a {@link SkylarkSemantics} object corresponding to this set of option values. */
   public SkylarkSemantics toSkylarkSemantics() {
@@ -544,6 +558,8 @@ public SkylarkSemantics toSkylarkSemantics() {
         .incompatibleRequireFeatureConfigurationForPic(requireFeatureConfigurationForPic)
         .incompatibleStricArgumentOrdering(incompatibleStricArgumentOrdering)
         .incompatibleStringIsNotIterable(incompatibleStringIsNotIterable)
+        .incompatibleUseToolchainProvidersInJavaCommon(
+            incompatibleUseToolchainProvidersInJavaCommon)
         .internalSkylarkFlagTestCanary(internalSkylarkFlagTestCanary)
         .build();
   }

src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java

@@ -467,6 +467,7 @@ public JavaInfo javaInfo(
                 javaToolchain,
                 hostJavabase,
                 jdeps,
+                env.getSemantics(),
                 loc);
       }
       if (compileJar == null) {

src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java

@@ -44,6 +44,7 @@
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkList;
+import com.google.devtools.build.lib.syntax.SkylarkSemantics;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
@@ -75,6 +76,7 @@ public static JavaInfoBuildHelper getInstance() {
    * @param actions used to create the ijar and single jar actions
    * @param javaToolchain the toolchain to be used for retrieving the ijar tool
    * @param jdeps optional jdeps information for outputJar
+   * @param semantics the skylark semantics
    * @return new created JavaInfo instance
    * @throws EvalException if some mandatory parameter are missing
    */
@@ -92,6 +94,7 @@ JavaInfo createJavaInfoLegacy(
       Object javaToolchain,
       Object hostJavabase,
       @Nullable Artifact jdeps,
+      SkylarkSemantics semantics,
       Location location)
       throws EvalException {
     final Artifact sourceJar;
@@ -103,10 +106,10 @@ JavaInfo createJavaInfoLegacy(
       if (!(actions instanceof SkylarkActionFactory)) {
         throw new EvalException(location, "Must pass ctx.actions when packing sources.");
       }
-      if (!isValidJavaToolchain(javaToolchain)) {
+      if (!isValidJavaToolchain(semantics, javaToolchain)) {
         throw new EvalException(location, "Must pass java_toolchain when packing sources.");
       }
-      if (!isValidJavaRuntime(hostJavabase)) {
+      if (!isValidJavaRuntime(semantics, hostJavabase)) {
         throw new EvalException(location, "Must pass host_javabase when packing sources.");
       }
       sourceJar =
@@ -117,6 +120,7 @@ JavaInfo createJavaInfoLegacy(
               sourceJars,
               javaToolchain,
               hostJavabase,
+              semantics,
               location);
     }
     final Artifact iJar;
@@ -126,7 +130,7 @@ JavaInfo createJavaInfoLegacy(
             location,
             "The value of use_ijar is True. Make sure the ctx.actions argument is valid.");
       }
-      if (!isValidJavaToolchain(javaToolchain)) {
+      if (!isValidJavaToolchain(semantics, javaToolchain)) {
         throw new EvalException(
             location,
             "The value of use_ijar is True. Make sure the java_toolchain argument is valid.");
@@ -136,7 +140,8 @@ JavaInfo createJavaInfoLegacy(
               (SkylarkActionFactory) actions,
               outputJar,
               null,
-              getJavaToolchainProvider(location, javaToolchain),
+              getJavaToolchainProvider(semantics, location, javaToolchain),
+              semantics,
               location);
     } else {
       iJar = outputJar;
@@ -245,6 +250,7 @@ Artifact packSourceFiles(
       SkylarkList<Artifact> sourceJars,
       Object javaToolchain,
       Object hostJavabase,
+      SkylarkSemantics semantics,
       Location location)
       throws EvalException {
     // No sources to pack, return None
@@ -257,8 +263,10 @@ Artifact packSourceFiles(
     }
     ActionRegistry actionRegistry = actions.asActionRegistry(location, actions);
     Artifact outputSrcJar = getSourceJar(actions.getActionConstructionContext(), outputJar);
-    JavaRuntimeInfo javaRuntimeInfo = getJavaRuntimeProvider(location, hostJavabase, null);
-    JavaToolchainProvider javaToolchainProvider = getJavaToolchainProvider(location, javaToolchain);
+    JavaRuntimeInfo javaRuntimeInfo =
+        getJavaRuntimeProvider(semantics, location, hostJavabase, null);
+    JavaToolchainProvider javaToolchainProvider =
+        getJavaToolchainProvider(semantics, location, javaToolchain);
     JavaSemantics javaSemantics = javaToolchainProvider.getJavaSemantics();
     SingleJarActionBuilder.createSourceJarAction(
         actionRegistry,
@@ -318,6 +326,7 @@ public JavaInfo create(
       NestedSet<Artifact> transitiveCompileTimeJars,
       NestedSet<Artifact> transitiveRuntimeJars,
       NestedSet<Artifact> sourceJars,
+      SkylarkSemantics semantics,
       Location location)
       throws EvalException {
 
@@ -329,7 +338,7 @@ public JavaInfo create(
             location,
             "The value of use_ijar is True. Make sure the ctx.actions argument is valid.");
       }
-      if (!isValidJavaToolchain(javaToolchain)) {
+      if (!isValidJavaToolchain(semantics, javaToolchain)) {
         throw new EvalException(
             location,
             "The value of use_ijar is True. Make sure the java_toolchain argument is valid.");
@@ -341,7 +350,8 @@ public JavaInfo create(
                 (SkylarkActionFactory) actions,
                 compileJar,
                 null,
-                getJavaToolchainProvider(location, javaToolchain),
+                getJavaToolchainProvider(semantics, location, javaToolchain),
+                semantics,
                 location));
       }
       javaCompilationArgsBuilder.addDirectCompileTimeJars(
@@ -397,12 +407,17 @@ public JavaInfo createJavaCompileAction(
     }
 
     JavaRuntimeInfo javaRuntimeInfo =
-        getJavaRuntimeProvider(location, hostJavabase, skylarkRuleContext.getRuleContext());
+        getJavaRuntimeProvider(
+            skylarkRuleContext.getSkylarkSemantics(),
+            location,
+            hostJavabase,
+            skylarkRuleContext.getRuleContext());
     if (javaRuntimeInfo == null) {
       throw new EvalException(location, "'host_javabase' must point to a Java runtime");
     }
 
-    JavaToolchainProvider toolchainProvider = getJavaToolchainProvider(location, javaToolchain);
+    JavaToolchainProvider toolchainProvider =
+        getJavaToolchainProvider(environment.getSemantics(), location, javaToolchain);
 
     JavaLibraryHelper helper =
         new JavaLibraryHelper(skylarkRuleContext.getRuleContext())
@@ -500,11 +515,13 @@ public Artifact buildIjar(
       Artifact inputJar,
       @Nullable Label targetLabel,
       Object javaToolchain,
+      SkylarkSemantics semantics,
       Location location)
       throws EvalException {
     String ijarBasename = FileSystemUtils.removeExtension(inputJar.getFilename()) + "-ijar.jar";
     Artifact interfaceJar = actions.declareFile(ijarBasename, inputJar);
-    FilesToRunProvider ijarTarget = getJavaToolchainProvider(location, javaToolchain).getIjar();
+    FilesToRunProvider ijarTarget =
+        getJavaToolchainProvider(semantics, location, javaToolchain).getIjar();
     CustomCommandLine.Builder commandLine =
         CustomCommandLine.builder().addExecPath(inputJar).addExecPath(interfaceJar);
     if (targetLabel != null) {
@@ -528,12 +545,14 @@ public Artifact stampJar(
       Artifact inputJar,
       Label targetLabel,
       Object javaToolchain,
+      SkylarkSemantics semantics,
       Location location)
       throws EvalException {
     String basename = FileSystemUtils.removeExtension(inputJar.getFilename()) + "-stamped.jar";
     Artifact outputJar = actions.declareFile(basename, inputJar);
     // ijar doubles as a stamping tool
-    FilesToRunProvider ijarTarget = getJavaToolchainProvider(location, javaToolchain).getIjar();
+    FilesToRunProvider ijarTarget =
+        getJavaToolchainProvider(semantics, location, javaToolchain).getIjar();
     CustomCommandLine.Builder commandLine =
         CustomCommandLine.builder()
             .addExecPath(inputJar)
@@ -553,15 +572,24 @@ public Artifact stampJar(
     return outputJar;
   }
 
-  private static boolean isValidJavaToolchain(Object javaToolchain) {
-    return javaToolchain instanceof ConfiguredTarget
+  private static boolean isValidJavaToolchain(
+      SkylarkSemantics skylarkSemantics, Object javaToolchain) {
+    return (!skylarkSemantics.incompatibleUseToolchainProvidersInJavaCommon()
+            && javaToolchain instanceof ConfiguredTarget)
         || javaToolchain instanceof JavaToolchainProvider;
   }
 
-  JavaToolchainProvider getJavaToolchainProvider(Location location, Object javaToolchain)
-      throws EvalException {
+  JavaToolchainProvider getJavaToolchainProvider(
+      SkylarkSemantics semantics, Location location, Object javaToolchain) throws EvalException {
     if (javaToolchain instanceof ConfiguredTarget) {
-      // TODO(b/122738702): remove support for passing toolchains as configured targets
+      if (semantics.incompatibleUseToolchainProvidersInJavaCommon()) {
+        // TODO(b/122738702): remove support for passing toolchains as configured targets
+        throw new EvalException(
+            location,
+            javaToolchain
+                + " pass a java_common.JavaToolchainInfo instead of a configured target;"
+                + " see https://github.com/bazelbuild/bazel/issues/7186.");
+      }
       ConfiguredTarget target = (ConfiguredTarget) javaToolchain;
       JavaToolchainProvider javaToolchainProvider = JavaToolchainProvider.from(target);
       if (javaToolchainProvider == null) {
@@ -576,14 +604,27 @@ JavaToolchainProvider getJavaToolchainProvider(Location location, Object javaToo
     throw new EvalException(null, javaToolchain + " is not a JavaToolchainProvider.");
   }
 
-  private static boolean isValidJavaRuntime(Object javaRuntime) {
-    return javaRuntime instanceof ConfiguredTarget || javaRuntime instanceof JavaRuntimeInfo;
+  private static boolean isValidJavaRuntime(SkylarkSemantics skylarkSemantics, Object javaRuntime) {
+    return (!skylarkSemantics.incompatibleUseToolchainProvidersInJavaCommon()
+            && javaRuntime instanceof ConfiguredTarget)
+        || javaRuntime instanceof JavaRuntimeInfo;
   }
 
   private JavaRuntimeInfo getJavaRuntimeProvider(
-      Location location, Object javabase, RuleContext ruleContext) throws EvalException {
+      SkylarkSemantics skylarkSemantics,
+      Location location,
+      Object javabase,
+      RuleContext ruleContext)
+      throws EvalException {
     if (javabase instanceof TransitiveInfoCollection) {
-      // TODO(b/122738702): remove support for passing toolchains as configured targets
+      if (skylarkSemantics.incompatibleUseToolchainProvidersInJavaCommon()) {
+        // TODO(b/122738702): remove support for passing toolchains as configured targets
+        throw new EvalException(
+            location,
+            javabase
+                + " pass a java_common.JavaRuntimeInfo instead of a configured target;"
+                + " see https://github.com/bazelbuild/bazel/issues/7186.");
+      }
       return JavaRuntimeInfo.from((TransitiveInfoCollection) javabase, ruleContext);
     }
     if (javabase instanceof JavaRuntimeInfo) {

src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java

@@ -70,6 +70,7 @@ public JavaInfo create(
             asArtifactNestedSet(transitiveCompileTimeJars),
             asArtifactNestedSet(transitiveRuntimeJars),
             asArtifactNestedSet(sourceJars),
+            environment.getSemantics(),
             location);
   }
 
@@ -131,14 +132,16 @@ public Artifact runIjar(
       Artifact jar,
       Object targetLabel,
       Object javaToolchain,
-      Location location)
+      Location location,
+      SkylarkSemantics semantics)
       throws EvalException {
     return JavaInfoBuildHelper.getInstance()
         .buildIjar(
             actions,
             jar,
             targetLabel != Runtime.NONE ? (Label) targetLabel : null,
             javaToolchain,
+            semantics,
             location);
   }
 
@@ -148,10 +151,11 @@ public Artifact stampJar(
       Artifact jar,
       Label targetLabel,
       Object javaToolchain,
-      Location location)
+      Location location,
+      SkylarkSemantics semantics)
       throws EvalException {
     return JavaInfoBuildHelper.getInstance()
-        .stampJar(actions, jar, targetLabel, javaToolchain, location);
+        .stampJar(actions, jar, targetLabel, javaToolchain, semantics, location);
   }
 
   @Override
@@ -162,25 +166,36 @@ public Artifact packSources(
       SkylarkList<Artifact> sourceJars,
       Object javaToolchain,
       Object hostJavabase,
-      Location location)
+      Location location,
+      SkylarkSemantics semantics)
       throws EvalException {
     return JavaInfoBuildHelper.getInstance()
         .packSourceFiles(
-            actions, outputJar, sourceFiles, sourceJars, javaToolchain, hostJavabase, location);
+            actions,
+            outputJar,
+            sourceFiles,
+            sourceJars,
+            javaToolchain,
+            hostJavabase,
+            semantics,
+            location);
   }
 
   @Override
   // TODO(b/78512644): migrate callers to passing explicit javacopts or using custom toolchains, and
   // delete
   public ImmutableList<String> getDefaultJavacOpts(
-      SkylarkRuleContext skylarkRuleContext, String javaToolchainAttr, Location location)
+      SkylarkRuleContext skylarkRuleContext,
+      String javaToolchainAttr,
+      Location location,
+      SkylarkSemantics skylarkSemantics)
       throws EvalException {
     RuleContext ruleContext = skylarkRuleContext.getRuleContext();
     ConfiguredTarget javaToolchainConfigTarget =
         (ConfiguredTarget) skylarkRuleContext.getAttr().getValue(javaToolchainAttr);
     JavaToolchainProvider toolchain =
         JavaInfoBuildHelper.getInstance()
-            .getJavaToolchainProvider(location, javaToolchainConfigTarget);
+            .getJavaToolchainProvider(skylarkSemantics, location, javaToolchainConfigTarget);
     ImmutableList<String> javacOptsFromAttr;
     if (ruleContext.getRule().isAttrDefined("javacopts", Type.STRING_LIST)) {
       javacOptsFromAttr = ruleContext.getExpander().withDataLocations().tokenized("javacopts");