use FLAG_SET_ERGO

Author: dougxc

src/hotspot/share/runtime/arguments.cpp

@@ -2255,12 +2255,7 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
         char after  = *(jvmci_module + strlen("jdk.internal.vm.ci"));
         if ((before == '=' || before == ',') && (after == '\0' || after == ',')) {
           if (!_jvmci_module_added) {
-            bool valid = process_argument("+EnableJVMCI", args->ignoreUnrecognized, origin);
-            if (!valid) {
-              jio_fprintf(defaultStream::error_stream(),
-                "'EnableJVMCI' implied by jdk.internal.vm.ci module in '%s'\n", option->optionString);
-              return JNI_EINVAL;
-            }
+            FLAG_SET_ERGO(EnableJVMCI, true);
             PropertyList_unique_add(&_system_properties, "jdk.internal.vm.ci.enabled", "true",
               AddProperty, UnwriteableProperty, InternalProperty);
             _jvmci_module_added = true;

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

@@ -64,37 +64,54 @@ 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());
+        useJVMCINativeLibrary = output.firstMatch("bool +UseJVMCINativeLibrary += true") != null;
+        String originOfEnableJVMCI = useJVMCINativeLibrary ? "default" : "command line";
+
         // Test EnableJVMCIProduct without any other explicit JVMCI option
         test("-XX:-PrintWarnings",
-            new Expectation("EnableJVMCI", "true", "default"),
+            new Expectation("EnableJVMCI", "true", originOfEnableJVMCI),
             new Expectation("UseJVMCICompiler", "true", "default"));
         test("-XX:+UseJVMCICompiler",
-            new Expectation("EnableJVMCI", "true", "default"),
+            new Expectation("EnableJVMCI", "true", originOfEnableJVMCI),
             new Expectation("UseJVMCICompiler", "true", "command line"));
         test("-XX:-UseJVMCICompiler",
-            new Expectation("EnableJVMCI", "true", "default"),
+            new Expectation("EnableJVMCI", "true", originOfEnableJVMCI),
             new Expectation("UseJVMCICompiler", "false", "command line"));
         test("-XX:+EnableJVMCI",
-            new Expectation("EnableJVMCI", "true", "command line"),
+            new Expectation("EnableJVMCI", "true", originOfEnableJVMCI),
             new Expectation("UseJVMCICompiler", "true", "default"));
         test("-XX:-EnableJVMCI",
             new Expectation("EnableJVMCI", "false", "command line"),
             new Expectation("UseJVMCICompiler", "false", "default"));
         test("-XX:+EnableJVMCIProduct",
             new Expectation("EnableJVMCIProduct", "true", "(?:command line|jimage)"),
-            new Expectation("EnableJVMCI", "true", "default"),
+            new Expectation("EnableJVMCI", "true", originOfEnableJVMCI),
             new Expectation("UseJVMCICompiler", "true", "default"));
     }
 
     static int id;
 
+    private static boolean useJVMCINativeLibrary = false;
+
     static void test(String explicitFlag, Expectation... expectations) throws Exception {
         String[] flags = {"-XX:+EnableJVMCIProduct", "-XX:+UseGraalJIT"};
         String cwd = System.getProperty("user.dir");
+
+        // 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";
+
         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());