Fixed sulong tests on JDK-21.

Author: tzezula

sulong/mx.sulong/mx_sulong_unittest.py

@@ -101,7 +101,7 @@ def apply(self, config, overrideSulongConfig=None):
             native_access_target_module = 'ALL-UNNAMED'
         vmArgs += [f'--enable-native-access={native_access_target_module}']
         # GR-59703: Migrate sun.misc.* usages.
-        vmArgs += ['--sun-misc-unsafe-memory-access=allow']
+        mx_truffle.enable_sun_misc_unsafe(vmArgs)
         if mx.get_opts().use_llvm_standalone is not None:
             vmArgs += [f'-Dsulongtest.testAOTImage={mx_sulong.get_lli_path()}']
         else:

sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/util/ProcessHarnessManager.java

@@ -270,7 +270,9 @@ private ProcessHarnessInstance startInstance() throws IOException {
             commandArgs.add("--enable-native-access=ALL-UNNAMED");
         }
         // GR-59703: Migrate sun.misc.* usages.
-        commandArgs.add("--sun-misc-unsafe-memory-access=allow");
+        if (Runtime.version().feature() >= 23) {
+            commandArgs.add("--sun-misc-unsafe-memory-access=allow");
+        }
 
         copyProperty(commandArgs, "polyglot.engine.WarnInterpreterOnly");
         copyProperty(commandArgs, "truffle.nfi.library");

truffle/mx.truffle/mx_truffle.py

@@ -222,7 +222,7 @@ def enable_sun_misc_unsafe(vmArgs):
     list of JVM arguments if the JDK version is 23 or higher. It then returns the
     updated list of arguments.
     """
-    if mx.VersionSpec("23.0.0") <= mx.get_jdk(tag="graalvm").version:
+    if mx.VersionSpec("23.0.0") <= mx.get_jdk(tag="default").version:
         vmArgs.extend(['--sun-misc-unsafe-memory-access=allow'])
     return vmArgs