putting jargraal on the --upgrade-module-path now also needs graal-na…

…tiveimage.jar
oracle · Jan 6, 2025 · 52e529a · 52e529a
1 parent d4916d2
commit 52e529a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py
@@ -735,11 +735,14 @@ def _sl_jvm_comiler_on_upgrade_module_path_gate_tests(jdk):
         # Ignore tests for Truffle LTS gate using GraalVM as a base JDK
         mx.log(f'Ignoring SL JVM Optimized with Compiler on Upgrade Module Path on {jdk.home} because JDK is GraalVM')
         return
-    compiler = mx.distribution('compiler:GRAAL')
+    compiler_cp = os.pathsep.join((mx.distribution(name).classpath_repr() for name in (
+        'compiler:GRAAL',
+        'compiler:GRAAL_NATIVEIMAGE'
+    )))
     vm_args = [
         '-XX:+UnlockExperimentalVMOptions',
         '-XX:+EnableJVMCI',
-        f'--upgrade-module-path={compiler.classpath_repr()}',
+        f'--upgrade-module-path={compiler_cp}',
     ]
 
     def run_jvm_optimized(test_file):