[GR-60186] Update labsjdk to 24+26-jvmci-b01

OracleLabsAutomation · zapster · commit 9625aeb8cf2d · 2024-12-04T12:49:08.000Z
PullRequest: graal/19475
diff --git a/common.json b/common.json
@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+25-3126", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+26-3309", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
 
     "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+25", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+25-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+25-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+25-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+25-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+25-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+25-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+26", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+26-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+26-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+26-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+26-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+26-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+26-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java
@@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
     private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
                     "21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
                     "24", Map.of(
-                                    "Oracle Corporation", createLabsJDKVersion("24+25", 1),
-                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+25", 1)));
+                                    "Oracle Corporation", createLabsJDKVersion("24+26", 1),
+                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+26", 1)));
     private static final int NA = 0;
     /**
      * Minimum Java release supported by Graal.
diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2306,6 +2306,9 @@ def _get_extra_jvm_args():
             extra_jvm_args = mx.list_to_cmd_line(image_config.extra_jvm_args)
             if isinstance(self.subject.component, mx_sdk.GraalVmTruffleComponent) or image_config.is_polyglot:
                 extra_jvm_args = ' '.join([extra_jvm_args, '--enable-native-access=org.graalvm.truffle'])
+                # GR-59703: Migrate sun.misc.* usages.
+                if mx.VersionSpec("23.0.0") <= mx.get_jdk(tag='default').version:
+                    extra_jvm_args = ' '.join([extra_jvm_args, '--sun-misc-unsafe-memory-access=allow'])
             if not _jlink_libraries():
                 if mx.is_windows():
                     extra_jvm_args = ' '.join([extra_jvm_args, r'--upgrade-module-path "%location%\..\..\jvmci\graal.jar"'])
diff --git a/sdk/src/org.graalvm.launcher.native/src/launcher.cc b/sdk/src/org.graalvm.launcher.native/src/launcher.cc
@@ -558,6 +558,10 @@ static void parse_vm_options(int argc, char **argv, std::string exeDir, JavaVMIn
 
         /* Allow Truffle NFI Panama to use Linker#{downcallHandle,upcallStub} without warnings. */
         vmArgs.push_back("--enable-native-access=org.graalvm.truffle");
+// GR-59703: Migrate sun.misc.* usages.
+#if LAUNCHER_JDK_VERSION >= 23
+        vmArgs.push_back("--sun-misc-unsafe-memory-access=allow");
+#endif
     }
 
     jint nOptions = jvmMode ? vmArgs.size() : 1 + vmArgs.size();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java
@@ -64,15 +64,15 @@
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/linux/os_linux.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/linux/os_linux.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+24/src/hotspot/os/posix/include/jvm_md.h")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+25/src/hotspot/os/posix/os_posix.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/hotspot/os/posix/os_posix.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+20/src/hotspot/os/posix/os_posix.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/os/posix/os_posix.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+25/src/hotspot/share/memory/allocation.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allocation.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allStatic.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/nmt/memTag.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+24/src/hotspot/share/runtime/os.cpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+25/src/hotspot/share/runtime/os.hpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/hotspot/share/runtime/os.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/runtime/os.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/utilities/checkedCast.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
@@ -86,8 +86,8 @@
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/logging/log.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/memory/allocation.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+25/src/hotspot/share/runtime/globals.hpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+22/src/hotspot/share/utilities/debug.cpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+16/src/hotspot/share/utilities/debug.hpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/hotspot/share/utilities/debug.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/hotspot/share/utilities/debug.hpp")
 public class ContainerLibrary {
     static final int VERSION = 240100;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/dcmd/AbstractDCmd.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/dcmd/AbstractDCmd.java
@@ -146,7 +146,7 @@ private DCmdOption<?> findOption(String optionName) {
         return null;
     }
 
-    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+18/src/hotspot/share/services/diagnosticArgument.cpp#L140-L166")
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/hotspot/share/services/diagnosticArgument.cpp#L141-L171")
     private static Object parseValue(DCmdOption<?> option, String valueString) {
         Class<?> type = option.type();
         if (type == Boolean.class) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ForeignDisabledSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ForeignDisabledSubstitutions.java
@@ -54,7 +54,15 @@ public boolean getAsBoolean() {
 final class Target_jdk_internal_foreign_MemorySessionImpl {
     @Substitute
     @SuppressWarnings("static-method")
-    Target_java_lang_foreign_Arena asArena() {
+    @TargetElement(name = "asArena", onlyWith = JDK21OrEarlier.class)
+    Target_java_lang_foreign_Arena asArenaJDK21() {
+        throw ForeignDisabledSubstitutions.fail();
+    }
+
+    @Substitute
+    @SuppressWarnings("static-method")
+    @TargetElement(onlyWith = JDKLatest.class)
+    Target_jdk_internal_foreign_ArenaImpl asArena() {
         throw ForeignDisabledSubstitutions.fail();
     }
 }
@@ -63,6 +71,10 @@ Target_java_lang_foreign_Arena asArena() {
 final class Target_java_lang_foreign_Arena {
 }
 
+@TargetClass(className = "jdk.internal.foreign.ArenaImpl", onlyWith = {ForeignDisabled.class, JDKLatest.class})
+final class Target_jdk_internal_foreign_ArenaImpl {
+}
+
 @TargetClass(className = "java.lang.foreign.Linker", onlyWith = ForeignDisabled.class)
 final class Target_java_lang_foreign_Linker {
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -714,6 +714,7 @@ public static Enumeration<URL> findResources(String name) {
 final class Target_jdk_internal_logger_LoggerFinderLoader {
     // Checkstyle: stop
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset, isFinal = true)//
+    @TargetElement(onlyWith = JDK21OrEarlier.class)//
     static Permission READ_PERMISSION;
     // Checkstyle: resume
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.charset.CharsetDecoder;
-import java.security.AccessControlContext;
 import java.util.concurrent.ForkJoinPool;
 
 import org.graalvm.nativeimage.ImageSingletons;
@@ -313,15 +312,6 @@ private static synchronized ForkJoinPool initializeCommonPool() {
     }
 }
 
-@TargetClass(value = java.util.concurrent.ForkJoinPool.class, innerClass = "DefaultForkJoinWorkerThreadFactory", onlyWith = JDKLatest.class)
-@SuppressWarnings("removal")
-final class Target_java_util_concurrent_ForkJoinPool_DefaultForkJoinWorkerThreadFactory {
-    @Alias @RecomputeFieldValue(kind = Reset) //
-    static AccessControlContext regularACC;
-    @Alias @RecomputeFieldValue(kind = Reset) //
-    static AccessControlContext commonACC;
-}
-
 /** Dummy class to have a class with the file's name. */
 public final class RecomputedFields {
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.security.AccessControlContext;
 import java.security.CodeSource;
@@ -47,6 +46,7 @@
 import java.util.WeakHashMap;
 import java.util.function.BooleanSupplier;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -65,6 +65,7 @@
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.graal.snippets.CEntryPointSnippets;
 import com.oracle.svm.core.thread.Target_java_lang_Thread;
+import com.oracle.svm.core.thread.Target_java_lang_ThreadLocal;
 import com.oracle.svm.core.util.BasedOnJDKFile;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
@@ -196,7 +197,13 @@ final class Target_java_security_Provider_ServiceKey {
 final class Target_java_security_Provider {
     @Alias //
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = ServiceKeyComputer.class) //
-    private static Target_java_security_Provider_ServiceKey previousKey;
+    @TargetElement(name = "previousKey", onlyWith = JDK21OrEarlier.class) //
+    private static Target_java_security_Provider_ServiceKey previousKeyJDK21;
+
+    @Alias //
+    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = ThreadLocalServiceKeyComputer.class) //
+    @TargetElement(onlyWith = JDKLatest.class) //
+    private static Target_java_lang_ThreadLocal previousKey;
 }
 
 @TargetClass(value = java.security.Provider.class, innerClass = "Service")
@@ -211,17 +218,40 @@ final class Target_java_security_Provider_Service {
     private Object constructorCache;
 }
 
+class ServiceKeyProvider {
+    static Object getNewServiceKey() {
+        Class<?> serviceKey = ReflectionUtil.lookupClass("java.security.Provider$ServiceKey");
+        Constructor<?> constructor = ReflectionUtil.lookupConstructor(serviceKey, String.class, String.class, boolean.class);
+        return ReflectionUtil.newInstance(constructor, "", "", false);
+    }
+
+    /**
+     * Originally the thread local creates a new default service key each time. Here we always
+     * return the singleton default service key. This default key will be replaced with an actual
+     * key in {@code java.security.Provider.parseLegacy}
+     */
+    static Supplier<Object> getNewServiceKeySupplier() {
+        final Object singleton = ServiceKeyProvider.getNewServiceKey();
+        return () -> singleton;
+    }
+}
+
 @Platforms(Platform.HOSTED_ONLY.class)
 class ServiceKeyComputer implements FieldValueTransformer {
     @Override
     public Object transform(Object receiver, Object originalValue) {
-        try {
-            Class<?> serviceKey = Class.forName("java.security.Provider$ServiceKey");
-            Constructor<?> constructor = ReflectionUtil.lookupConstructor(serviceKey, String.class, String.class, boolean.class);
-            return constructor.newInstance("", "", false);
-        } catch (InstantiationException | IllegalAccessException | InvocationTargetException | ClassNotFoundException e) {
-            throw VMError.shouldNotReachHere(e);
-        }
+        return ServiceKeyProvider.getNewServiceKey();
+    }
+}
+
+@Platforms(Platform.HOSTED_ONLY.class)
+class ThreadLocalServiceKeyComputer implements FieldValueTransformer {
+    @Override
+    public Object transform(Object receiver, Object originalValue) {
+        // Originally the thread local creates a new default service key each time.
+        // Here we always return the singleton default service key. This default key
+        // will be replaced with an actual key in Provider.parseLegacy
+        return ThreadLocal.withInitial(ServiceKeyProvider.getNewServiceKeySupplier());
     }
 }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_nio_DirectByteBuffer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_nio_DirectByteBuffer.java
@@ -34,7 +34,7 @@
 import com.oracle.svm.core.util.VMError;
 
 @TargetClass(className = "java.nio.DirectByteBuffer")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+23/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template")
 public final class Target_java_nio_DirectByteBuffer {
 
     /**
diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/UpcallStub.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/UpcallStub.java
@@ -93,7 +93,7 @@
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+22/src/hotspot/share/prims/upcallLinker.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/hotspot/share/prims/upcallLinker.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+19/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+19/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp")
 public abstract class UpcallStub extends NonBytecodeMethod {
diff --git a/sulong/mx.sulong/mx_sulong_unittest.py b/sulong/mx.sulong/mx_sulong_unittest.py
@@ -100,6 +100,8 @@ def apply(self, config, overrideSulongConfig=None):
         else:
             native_access_target_module = 'ALL-UNNAMED'
         vmArgs += [f'--enable-native-access={native_access_target_module}']
+        # GR-59703: Migrate sun.misc.* usages.
+        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:
diff --git a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/util/ProcessHarnessManager.java b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/util/ProcessHarnessManager.java
@@ -269,6 +269,10 @@ private ProcessHarnessInstance startInstance() throws IOException {
         } else {
             commandArgs.add("--enable-native-access=ALL-UNNAMED");
         }
+        // GR-59703: Migrate sun.misc.* usages.
+        if (Runtime.version().feature() >= 23) {
+            commandArgs.add("--sun-misc-unsafe-memory-access=allow");
+        }
 
         copyProperty(commandArgs, "polyglot.engine.WarnInterpreterOnly");
         copyProperty(commandArgs, "truffle.nfi.library");
diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py
@@ -215,6 +215,17 @@ def enable_truffle_native_access(vmArgs):
     vmArgs.extend([f'--enable-native-access={native_access_target_module}'])
     return vmArgs
 
+def enable_sun_misc_unsafe(vmArgs):
+    """
+    Enables `sun.misc.Unsafe` access.
+    This function appends the `--sun-misc-unsafe-memory-access=allow` option to the
+    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="default").version:
+        vmArgs.extend(['--sun-misc-unsafe-memory-access=allow'])
+    return vmArgs
+
 class TruffleUnittestConfig(mx_unittest.MxUnittestConfig):
 
     _use_enterprise_polyglot = True
@@ -247,6 +258,7 @@ def apply(self, config):
         # Disable VirtualThread warning
         vmArgs = vmArgs + ['-Dpolyglot.engine.WarnVirtualThreadSupport=false']
         enable_truffle_native_access(vmArgs)
+        enable_sun_misc_unsafe(vmArgs)
         return (vmArgs, mainClass, mainClassArgs)
 
 
@@ -389,6 +401,7 @@ def _sl_command(jdk, vm_args, sl_args, use_optimized_runtime=True, use_enterpris
         vm_args += ["--enable-native-access=ALL-UNNAMED"]
     else:
         vm_args += ["--enable-native-access=org.graalvm.truffle"]
+    enable_sun_misc_unsafe(vm_args)
 
     return [jdk.java] + jdk.processArgs(vm_args + mx.get_runtime_jvm_args(names=dist_names, force_cp=force_cp) + main_class + sl_args)
 
diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -33,7 +33,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "03d0952f738564024f9f2743ed44a96ff1185ba1",
+                "version": "a8c4ccf4e55a69467f3de56dbb9c53a25ad7b5f2",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
@@ -42,7 +42,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "03d0952f738564024f9f2743ed44a96ff1185ba1",
+                "version": "a8c4ccf4e55a69467f3de56dbb9c53a25ad7b5f2",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
diff --git a/vm/tests/all/agentscript/agent-dumparray.test b/vm/tests/all/agentscript/agent-dumparray.test
diff --git a/vm/tests/all/agentscript/agent-dumpheap.test b/vm/tests/all/agentscript/agent-dumpheap.test
diff --git a/vm/tests/all/agentscript/agent-embedding-symlinks.test b/vm/tests/all/agentscript/agent-embedding-symlinks.test
diff --git a/vm/tests/all/agentscript/agent-embedding.test b/vm/tests/all/agentscript/agent-embedding.test
diff --git a/vm/tests/all/agentscript/agent-ruby-dump.test b/vm/tests/all/agentscript/agent-ruby-dump.test
diff --git a/wasm/mx.wasm/mx_wasm.py b/wasm/mx.wasm/mx_wasm.py

Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,10 @@ static void parse_vm_options(int argc, char **argv, std::string exeDir, JavaVMIn`
`558`	`558`
`559`	`559`	`/* Allow Truffle NFI Panama to use Linker#{downcallHandle,upcallStub} without warnings. */`
`560`	`560`	`vmArgs.push_back("--enable-native-access=org.graalvm.truffle");`
	`561`	`+// GR-59703: Migrate sun.misc.* usages.`
	`562`	`+#if LAUNCHER_JDK_VERSION >= 23`
	`563`	`+ vmArgs.push_back("--sun-misc-unsafe-memory-access=allow");`
	`564`	`+#endif`
`561`	`565`	`}`
`562`	`566`
`563`	`567`	`jint nOptions = jvmMode ? vmArgs.size() : 1 + vmArgs.size();`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private DCmdOption<?> findOption(String optionName) {`
`146`	`146`	`return null;`
`147`	`147`	`}`
`148`	`148`
`149`		`- @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+18/src/hotspot/share/services/diagnosticArgument.cpp#L140-L166")`
	`149`	`+ @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/hotspot/share/services/diagnosticArgument.cpp#L141-L171")`
`150`	`150`	`private static Object parseValue(DCmdOption<?> option, String valueString) {`
`151`	`151`	`Class<?> type = option.type();`
`152`	`152`	`if (type == Boolean.class) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* Copyright (c) 2020, 2020, Red Hat Inc. All rights reserved.`
`4`	`4`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`5`	`5`	`*`
`@@ -714,6 +714,7 @@ public static Enumeration<URL> findResources(String name) {`
`714`	`714`	`final class Target_jdk_internal_logger_LoggerFinderLoader {`
`715`	`715`	`// Checkstyle: stop`
`716`	`716`	`@Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset, isFinal = true)//`
	`717`	`+ @TargetElement(onlyWith = JDK21OrEarlier.class)//`
`717`	`718`	`static Permission READ_PERMISSION;`
`718`	`719`	`// Checkstyle: resume`
`719`	`720`	`}`