8345826: [DO NOT MERGE] Do not automatically resolve jdk.internal.vm.ci when libgraal is used

src/hotspot/share/jvmci/jvmci_globals.hpp

@@ -45,7 +45,8 @@ class fileStream;
                     constraint)                                             \
                                                                             \
   product(bool, EnableJVMCI, false, EXPERIMENTAL,                           \
-          "Enable JVMCI. Defaults to true if UseJVMCICompiler is true.")    \
+          "Enable JVMCI. Defaults to true if UseJVMCICompiler is true or "  \
+          "jdk.internal.vm.ci is added to the root set with --add-modules.")\
                                                                             \
   product(bool, UseGraalJIT, false, EXPERIMENTAL,                           \
           "Select the Graal JVMCI compiler. This is an alias for: "         \

src/hotspot/share/runtime/arguments.cpp

@@ -85,6 +85,9 @@ int    Arguments::_num_jvm_flags                = 0;
 char** Arguments::_jvm_args_array               = nullptr;
 int    Arguments::_num_jvm_args                 = 0;
 unsigned int Arguments::_addmods_count          = 0;
+#if INCLUDE_JVMCI
+bool   Arguments::_jvmci_module_added           = false;
+#endif
 char*  Arguments::_java_command                 = nullptr;
 SystemProperty* Arguments::_system_properties   = nullptr;
 size_t Arguments::_conservative_max_heap_alignment = 0;
@@ -1798,13 +1801,13 @@ bool Arguments::check_vm_args_consistency() {
   status = CompilerConfig::check_args_consistency(status);
 #if INCLUDE_JVMCI
   if (status && EnableJVMCI) {
+    if (ClassLoader::is_module_observable("jdk.internal.vm.ci") && !UseJVMCINativeLibrary && !_jvmci_module_added) {
+      jio_fprintf(defaultStream::error_stream(),
+        "'+EnableJVMCI' requires '--add-modules=jdk.internal.vm.ci' when UseJVMCINativeLibrary is false\n");
+      return false;
+    }
     PropertyList_unique_add(&_system_properties, "jdk.internal.vm.ci.enabled", "true",
         AddProperty, UnwriteableProperty, InternalProperty);
-    if (ClassLoader::is_module_observable("jdk.internal.vm.ci")) {
-      if (!create_numbered_module_property("jdk.module.addmods", "jdk.internal.vm.ci", _addmods_count++)) {
-        return false;
-      }
-    }
   }
 #endif
 
@@ -2247,6 +2250,19 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
       if (!create_numbered_module_property("jdk.module.addmods", tail, _addmods_count++)) {
         return JNI_ENOMEM;
       }
+#if INCLUDE_JVMCI
+      if (!_jvmci_module_added) {
+        const char *jvmci_module = strstr(tail, "jdk.internal.vm.ci");
+        if (jvmci_module != nullptr) {
+          char before = *(jvmci_module - 1);
+          char after  = *(jvmci_module + strlen("jdk.internal.vm.ci"));
+          if ((before == '=' || before == ',') && (after == '\0' || after == ',')) {
+            FLAG_SET_DEFAULT(EnableJVMCI, true);
+            _jvmci_module_added = true;
+          }
+        }
+      }
+#endif
     } else if (match_option(option, "--enable-native-access=", &tail)) {
       if (!create_numbered_module_property("jdk.module.enable.native.access", tail, enable_native_access_count++)) {
         return JNI_ENOMEM;

src/hotspot/share/runtime/arguments.hpp

@@ -197,6 +197,10 @@ class Arguments : AllStatic {
   static char* _java_command;
   // number of unique modules specified in the --add-modules option
   static unsigned int _addmods_count;
+  // number of unique modules specified in the --add-modules option
+#if INCLUDE_JVMCI
+  static bool _jvmci_module_added;
+#endif
 
   // Property list
   static SystemProperty* _system_properties;

test/hotspot/jtreg/compiler/jvmci/TestEnableJVMCIProduct.java

@@ -64,37 +64,50 @@ public static void main(String[] args) throws Exception {
                       .collect(Collectors.joining(",")));
             return;
         }
+
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:+UnlockExperimentalVMOptions", "-XX:+UseJVMCICompiler",
+            "-XX:+PrintFlagsFinal", "--version");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        boolean useJVMCINativeLibrary = output.firstMatch("bool +UseJVMCINativeLibrary += true") != null;
+        // If libjvmci is not in use, then the JVMCI module must be explicitly
+        // added with --add-modules=jdk.internal.vm.ci
+        String addJVMCIModule = useJVMCINativeLibrary ?
+            "--add-modules=java.base" : // effectively a nop
+            "--add-modules=jdk.internal.vm.ci";
+
         // Test EnableJVMCIProduct without any other explicit JVMCI option
-        test("-XX:-PrintWarnings",
+        test("-XX:-PrintWarnings", addJVMCIModule,
             new Expectation("EnableJVMCI", "true", "default"),
             new Expectation("UseJVMCICompiler", "true", "default"));
-        test("-XX:+UseJVMCICompiler",
+        test("-XX:+UseJVMCICompiler", addJVMCIModule,
             new Expectation("EnableJVMCI", "true", "default"),
             new Expectation("UseJVMCICompiler", "true", "command line"));
-        test("-XX:-UseJVMCICompiler",
+        test("-XX:-UseJVMCICompiler", addJVMCIModule,
             new Expectation("EnableJVMCI", "true", "default"),
             new Expectation("UseJVMCICompiler", "false", "command line"));
-        test("-XX:+EnableJVMCI",
+        test("-XX:+EnableJVMCI", addJVMCIModule,
             new Expectation("EnableJVMCI", "true", "command line"),
             new Expectation("UseJVMCICompiler", "true", "default"));
-        test("-XX:-EnableJVMCI",
+        test("-XX:-EnableJVMCI", addJVMCIModule,
             new Expectation("EnableJVMCI", "false", "command line"),
             new Expectation("UseJVMCICompiler", "false", "default"));
-        test("-XX:+EnableJVMCIProduct",
+        test("-XX:+EnableJVMCIProduct", addJVMCIModule,
             new Expectation("EnableJVMCIProduct", "true", "(?:command line|jimage)"),
             new Expectation("EnableJVMCI", "true", "default"),
             new Expectation("UseJVMCICompiler", "true", "default"));
     }
 
     static int id;
 
-    static void test(String explicitFlag, Expectation... expectations) throws Exception {
+    static void test(String explicitFlag, String addJVMCIModule, Expectation... expectations) throws Exception {
         String[] flags = {"-XX:+EnableJVMCIProduct", "-XX:+UseGraalJIT"};
         String cwd = System.getProperty("user.dir");
+
         for (String flag : flags) {
             Path propsPath = Path.of("props." + id++);
             ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-                "-XX:+UnlockExperimentalVMOptions", flag, "-XX:-UnlockExperimentalVMOptions",
+                "-XX:+UnlockExperimentalVMOptions", addJVMCIModule, flag, "-XX:-UnlockExperimentalVMOptions",
                 explicitFlag,
                 "-XX:+PrintFlagsFinal",
                 "--class-path=" + System.getProperty("java.class.path"),

test/hotspot/jtreg/compiler/jvmci/TestInvalidJVMCIOption.java

@@ -41,6 +41,7 @@ public static void main(String[] args) throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:+UnlockExperimentalVMOptions",
             "-XX:+EagerJVMCI",
+            "--add-modules=jdk.internal.vm.ci",
             "-XX:+UseJVMCICompiler",
             "-Djvmci.XXXXXXXXX=true");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());

test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java

@@ -44,6 +44,7 @@ public static void main(String[] args) throws Exception {
     static void test(String enableFlag) throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:+UnlockExperimentalVMOptions",
+            "--add-modules=jdk.internal.vm.ci",
             enableFlag, "-Djvmci.Compiler=null",
             "-XX:+JVMCIPrintProperties");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());

test/hotspot/jtreg/compiler/jvmci/TestJVMCISavedProperties.java

@@ -48,7 +48,7 @@ public static void main(String[] args) throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:+UnlockExperimentalVMOptions",
             "-XX:+EagerJVMCI",
-            "-XX:+EnableJVMCI",
+            "--add-modules=jdk.internal.vm.ci",
             "-Ddebug.jvmci.PrintSavedProperties=true",
             "-Dapp1.propX=true",
             "-Dapp2.propY=SomeStringValue",

test/hotspot/jtreg/compiler/jvmci/TestValidateModules.java

@@ -36,7 +36,7 @@
 public class TestValidateModules {
     public static void main(String... args) throws Exception {
         ProcessTools.executeTestJava("-XX:+UnlockExperimentalVMOptions",
-                                     "-XX:+EnableJVMCI",
+                                     "--add-modules=jdk.internal.vm.ci",
                                      "--validate-modules",
                                      "--list-modules")
                 .outputTo(System.out)

test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetFlagValueTest.java

@@ -65,7 +65,7 @@ public static void main(String[] args) throws Exception {
 
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:+UnlockExperimentalVMOptions",
-            "-XX:+EnableJVMCI",
+            "--add-modules=jdk.internal.vm.ci",
             "-XX:+PrintFlagsFinal",
             "-version");
         out = new OutputAnalyzer(pb.start());

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHotSpotJVMCIRuntime.java

@@ -169,7 +169,7 @@ public void jniEnomemTest() throws Exception {
         for (String name : names) {
             ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
                 "-XX:+UnlockExperimentalVMOptions",
-                "-XX:+EnableJVMCI",
+                "--add-modules=jdk.internal.vm.ci",
                 "-XX:-UseJVMCICompiler",
                 "-XX:+UseJVMCINativeLibrary",
                 "-Dtest.jvmci.forceEnomemOnLibjvmciInit=true",