Allow tuning JavaBuilder JVM flags for individual targets

PiperOrigin-RevId: 587033579
Change-Id: I31b3022e94fce8115909e80c6c2a6b34363c42b3

Author: cushon

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

@@ -73,6 +73,7 @@ public final class JavaCompilationHelper {
   private final JavaTargetAttributes.Builder attributes;
   private JavaTargetAttributes builtAttributes;
   private final ImmutableList<String> customJavacOpts;
+  private NestedSet<String> javaBuilderJvmFlags = NestedSetBuilder.emptySet(Order.STABLE_ORDER);
   private final JavaSemantics semantics;
   private final ImmutableList<Artifact> additionalInputsForDatabinding;
   private final StrictDepsMode strictJavaDeps;
@@ -139,6 +140,10 @@ static ImmutableList<String> internJavacOpts(@Nullable ImmutableList<String> jav
     return javacOptsInterner.intern(javacOpts);
   }
 
+  public void javaBuilderJvmFlags(NestedSet<String> javaBuilderJvmFlags) {
+    this.javaBuilderJvmFlags = javaBuilderJvmFlags;
+  }
+
   public void enableJspecify(boolean enableJspecify) {
     this.enableJspecify = enableJspecify;
   }
@@ -346,7 +351,8 @@ && getJavaConfiguration().experimentalEnableJspecify()
     }
     builder.setSourcePathEntries(attributes.getSourcePath());
     builder.setToolsJars(javaToolchain.getTools());
-    builder.setJavaBuilder(javaToolchain.getJavaBuilder());
+    builder.setJavaBuilder(
+        javaToolchain.getJavaBuilder().withAdditionalJvmFlags(javaBuilderJvmFlags));
     if (!turbineAnnotationProcessing) {
       builder.setGenSourceOutput(outputs.genSource());
       builder.setAdditionalOutputs(attributes.getAdditionalOutputs());

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

@@ -179,6 +179,7 @@ public void createCompilationAction(
       Depset compileTimeClasspath,
       Depset directJars,
       Object bootClassPathUnchecked,
+      Depset javaBuilderJvmFlags,
       Depset compileTimeJavaDeps,
       Depset javacOpts,
       String strictDepsMode,
@@ -249,6 +250,8 @@ public void createCompilationAction(
             JavaToolchainProvider.PROVIDER.wrap(javaToolchain),
             Sequence.cast(additionalInputs, Artifact.class, "additional_inputs")
                 .getImmutableList());
+    compilationHelper.javaBuilderJvmFlags(
+        Depset.cast(javaBuilderJvmFlags, String.class, "javabuilder_jvm_flags"));
     compilationHelper.enableJspecify(enableJSpecify);
     compilationHelper.enableDirectClasspath(enableDirectClasspath);
     compilationHelper.createCompileAction(outputs);

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

@@ -132,4 +132,17 @@ void addInputs(JavaToolchainProvider toolchain, NestedSetBuilder<Artifact> input
       inputs.addTransitive(toolchain.getJavaRuntime().javaBaseInputs());
     }
   }
+
+  public JavaToolchainTool withAdditionalJvmFlags(NestedSet<String> additionalJvmFlags) {
+    if (additionalJvmFlags.isEmpty()) {
+      return this;
+    }
+    return create(
+        tool(),
+        data(),
+        NestedSetBuilder.<String>stableOrder()
+            .addTransitive(jvmOpts())
+            .addTransitive(additionalJvmFlags)
+            .build());
+  }
 }

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java

@@ -537,6 +537,7 @@ void createHeaderCompilationAction(
         @Param(name = "compilation_classpath"),
         @Param(name = "direct_jars"),
         @Param(name = "bootclasspath"),
+        @Param(name = "javabuilder_jvm_flags"),
         @Param(name = "compile_time_java_deps"),
         @Param(name = "javac_opts"),
         @Param(name = "strict_deps_mode"),
@@ -566,6 +567,7 @@ void createCompilationAction(
       Depset compileTimeClasspath,
       Depset directJars,
       Object bootClassPath,
+      Depset javabuilderJvmFlags,
       Depset compileTimeJavaDeps,
       Depset javacOpts,
       String strictDepsMode,

src/main/starlark/builtins_bzl/common/java/basic_java_library.bzl

@@ -76,7 +76,8 @@ def basic_java_library(
         proguard_specs = None,
         add_exports = [],
         add_opens = [],
-        bootclasspath = None):
+        bootclasspath = None,
+        javabuilder_jvm_flags = None):
     """
     Creates actions that compile and lint Java sources, sets up coverage and returns JavaInfo, InstrumentedFilesInfo and output groups.
 
@@ -111,6 +112,7 @@ def basic_java_library(
       add_exports: (list[str]) Allow this library to access the given <module>/<package>.
       add_opens: (list[str]) Allow this library to reflectively access the given <module>/<package>.
       bootclasspath: (Target) The JDK APIs to compile this library against.
+      javabuilder_jvm_flags: (list[str]) Additional JVM flags to pass to JavaBuilder.
     Returns:
       (dict[str, Provider],
         {files_to_build: list[File],
@@ -150,6 +152,7 @@ def basic_java_library(
         add_exports = add_exports,
         add_opens = add_opens,
         bootclasspath = bootclasspath[BootClassPathInfo] if bootclasspath else None,
+        javabuilder_jvm_flags = javabuilder_jvm_flags,
     )
     target = {"JavaInfo": java_info}
 

src/main/starlark/builtins_bzl/common/java/compile_action.bzl

@@ -57,7 +57,8 @@ def compile_action(
         enable_compile_jar_action = True,
         add_exports = [],
         add_opens = [],
-        bootclasspath = None):
+        bootclasspath = None,
+        javabuilder_jvm_flags = None):
     """
     Creates actions that compile Java sources, produce source jar, and produce header jar and returns JavaInfo.
 
@@ -119,6 +120,7 @@ def compile_action(
       add_exports: (list[str]) Allow this library to access the given <module>/<package>.
       add_opens: (list[str]) Allow this library to reflectively access the given <module>/<package>.
       bootclasspath: (BootClassPathInfo) The set of JDK APIs to compile this library against.
+      javabuilder_jvm_flags: (list[str]) Additional JVM flags to pass to JavaBuilder.
 
     Returns:
       ((JavaInfo, {files_to_build: list[File],
@@ -155,6 +157,7 @@ def compile_action(
         add_exports = add_exports,
         add_opens = add_opens,
         bootclasspath = bootclasspath,
+        javabuilder_jvm_flags = javabuilder_jvm_flags,
     )
 
     compilation_info = struct(

src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl

@@ -46,6 +46,7 @@ def compile(
         annotation_processor_additional_outputs = [],
         strict_deps = "ERROR",
         bootclasspath = None,
+        javabuilder_jvm_flags = None,
         sourcepath = [],
         resources = [],
         add_exports = [],
@@ -89,6 +90,7 @@ def compile(
             'OFF', 'ERROR', 'WARN' and 'DEFAULT'.
         bootclasspath: (BootClassPathInfo) If present, overrides the bootclasspath associated with
             the provided java_toolchain. Optional.
+        javabuilder_jvm_flags: (list[str]) Additional JVM flags to pass to JavaBuilder.
         sourcepath: ([File])
         resources: ([File])
         resource_jars: ([File])
@@ -241,6 +243,7 @@ def compile(
         compilation_classpath,
         direct_jars,
         bootclasspath,
+        depset(javabuilder_jvm_flags),
         compile_time_java_deps,
         all_javac_opts,
         strict_deps,

src/main/starlark/builtins_bzl/common/java/java_library.bzl

@@ -38,7 +38,8 @@ def bazel_java_library_rule(
         proguard_specs = [],
         add_exports = [],
         add_opens = [],
-        bootclasspath = None):
+        bootclasspath = None,
+        javabuilder_jvm_flags = None):
     """Implements java_library.
 
     Use this call when you need to produce a fully fledged java_library from
@@ -60,6 +61,7 @@ def bazel_java_library_rule(
       add_exports: (list[str]) Allow this library to access the given <module>/<package>.
       add_opens: (list[str]) Allow this library to reflectively access the given <module>/<package>.
       bootclasspath: (Target) The JDK APIs to compile this library against.
+      javabuilder_jvm_flags: (list[str]) Additional JVM flags to pass to JavaBuilder.
     Returns:
       (dict[str, provider]) A list containing DefaultInfo, JavaInfo,
         InstrumentedFilesInfo, OutputGroupsInfo, ProguardSpecProvider providers.
@@ -84,6 +86,7 @@ def bazel_java_library_rule(
         add_exports = add_exports,
         add_opens = add_opens,
         bootclasspath = bootclasspath,
+        javabuilder_jvm_flags = javabuilder_jvm_flags,
     )
 
     target["DefaultInfo"] = construct_defaultinfo(
@@ -114,6 +117,7 @@ def _proxy(ctx):
         ctx.attr.add_exports,
         ctx.attr.add_opens,
         ctx.attr.bootclasspath,
+        ctx.attr.javabuilder_jvm_flags,
     ).values()
 
 JAVA_LIBRARY_IMPLICIT_ATTRS = BASIC_JAVA_LIBRARY_IMPLICIT_ATTRS
@@ -165,6 +169,7 @@ JAVA_LIBRARY_ATTRS = merge_attrs(
             providers = [BootClassPathInfo],
             flags = ["SKIP_CONSTRAINTS_OVERRIDE"],
         ),
+        "javabuilder_jvm_flags": attr.string_list(),
         "javacopts": attr.string_list(),
         "neverlink": attr.bool(),
         "resource_strip_prefix": attr.string(),