squash: consolidate VM args that should be in sync

Author: dougxc

sdk/mx.sdk/mx_sdk.py

@@ -261,6 +261,16 @@ def jlink_new_jdk(jdk, dst_jdk_dir, module_dists, ignore_dists,
                                    default_to_jvmci=default_to_jvmci)
 
 class GraalVMJDKConfig(mx.JDKConfig):
+
+    # Oracle JDK includes the libjvmci compiler, allowing it to function as GraalVM.
+    # However, the Graal compiler is disabled by default and must be explicitly
+    # enabled using the -XX:+UseGraalJIT option.
+    libgraal_additional_vm_args = [
+        '-XX:+UnlockExperimentalVMOptions',
+        '-XX:+EnableJVMCI',
+        '-XX:+UseGraalJIT',
+        '-XX:-UnlockExperimentalVMOptions'
+    ]
     """
     A JDKConfig that configures the built GraalVM as a JDK config.
     """
@@ -270,10 +280,8 @@ def __init__(self):
             graalvm_home = default_jdk.home
             additional_vm_args = []
         elif GraalVMJDKConfig.is_libgraal_jdk(default_jdk.home):
-            # Oracle JDK includes the libjvmci compiler, allowing it to function as GraalVM.
-            # However, the Graal compiler is disabled by default and must be explicitly enabled using the -XX:+UseGraalJIT option.
             graalvm_home = default_jdk.home
-            additional_vm_args = ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI', '-XX:+UseGraalJIT', '-XX:-UnlockExperimentalVMOptions']
+            additional_vm_args = GraalVMJDKConfig.libgraal_additional_vm_args
         else:
             graalvm_home = mx_sdk_vm.graalvm_home(fatalIfMissing=True)
             additional_vm_args = []

truffle/mx.truffle/mx_truffle.py

@@ -499,7 +499,7 @@ def _truffle_gate_runner(args, tasks):
 
 def gate_truffle_jvm(tasks):
     if mx_sdk.GraalVMJDKConfig.is_libgraal_jdk(mx.get_jdk(tag='default').home):
-        additional_jvm_args = ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI', '-XX:-UnlockExperimentalVMOptions']
+        additional_jvm_args = mx_sdk.GraalVMJDKConfig.libgraal_additional_vm_args
     else:
         additional_jvm_args = []
     # GR-62632: Debug VM exception translation failure