[GR-57740] Update labsjdk to 24+13-jvmci-b01

PullRequest: graal/18706

Author: OracleLabsAutomation

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+12-1236", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+13-1404", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] },
 
@@ -45,13 +45,13 @@
     "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
     "graalvm-ee-21":      {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+12", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+12-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+12-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+12-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+12-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+12-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+12-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+13", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+13-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+13-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+13-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+13-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+13-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+13-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfig.java

@@ -370,6 +370,9 @@ public long defaultPrototypeMarkWord() {
      */
     public final int identityHashCodeShift = getConstant("markWord::hash_shift", Integer.class);
 
+    public final int contEntry = getFieldOffset("JavaThread::_cont_entry", Integer.class, "ContinuationEntry*", -1, JDK >= 24);
+    public final int pinCount = getFieldOffset("ContinuationEntry::_pin_count", Integer.class, "uint32_t", -1, JDK >= 24);
+
     /**
      * Identity hash code value when uninitialized.
      */

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+12", 1),
-                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+12", 1)));
+                                    "Oracle Corporation", createLabsJDKVersion("24+13", 1),
+                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+13", 1)));
     private static final int NA = 0;
     /**
      * Minimum Java release supported by Graal.

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

@@ -40,9 +40,13 @@
 import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT;
 import static jdk.graal.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32;
 import static jdk.graal.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C;
+import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CONTINUATION_ENTRY_PIN_COUNT;
+import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_CONT_ENTRY;
 import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsing;
 import static jdk.graal.compiler.nodes.ConstantNode.forBoolean;
+import static jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData.injected;
 import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.vm.ci.meta.DeoptimizationReason.TypeCheckedInliningViolated;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 
 import java.lang.annotation.Annotation;
@@ -98,8 +102,6 @@
 import jdk.graal.compiler.nodes.MergeNode;
 import jdk.graal.compiler.nodes.NodeView;
 import jdk.graal.compiler.nodes.PiNode;
-import jdk.graal.compiler.nodes.ProfileData;
-import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.ValueNode;
 import jdk.graal.compiler.nodes.ValuePhiNode;
@@ -245,6 +247,7 @@ public void run() {
                 registerSystemPlugins(invocationPlugins);
                 registerThreadPlugins(invocationPlugins, config, replacements);
                 registerVirtualThreadPlugins(invocationPlugins, config, replacements);
+                registerContinuationPlugins(invocationPlugins, config, replacements);
                 registerCallSitePlugins(invocationPlugins);
                 registerReflectionPlugins(invocationPlugins, replacements, config);
                 registerAESPlugins(invocationPlugins, config, replacements, target.arch);
@@ -732,8 +735,7 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
             BeginNode trueSuccessor = graph.add(new BeginNode());
             BeginNode falseSuccessor = graph.add(new BeginNode());
 
-            ProfileData.BranchProbabilityData probability = ProfileData.BranchProbabilityData.injected(NOT_FREQUENT_PROBABILITY);
-            b.add(new IfNode(testNotifyJvmtiEnabled, trueSuccessor, falseSuccessor, probability));
+            b.add(new IfNode(testNotifyJvmtiEnabled, trueSuccessor, falseSuccessor, injected(NOT_FREQUENT_PROBABILITY)));
 
             // if notifyJvmti enabled then make a call to the given runtime function
             ForeignCallNode runtimeCall = graph.add(new ForeignCallNode(descriptor, virtualThread, hide, javaThread));
@@ -761,6 +763,62 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
         }
     }
 
+    // @formatter:off
+    @SyncPort(from = "https://github.com/openjdk/jdk/blob/20d8f58c92009a46dfb91b951e7d87b4cb8e8b41/src/hotspot/share/opto/library_call.cpp#L3741-L3824",
+              sha1 = "d65356dbc0235df26aa56b233bcd100462a5dab4")
+    // @formatter:on
+    private static class ContinuationPinningPlugin extends InvocationPlugin {
+
+        private final GraalHotSpotVMConfig config;
+        private final boolean pin;
+
+        ContinuationPinningPlugin(GraalHotSpotVMConfig config, boolean pin) {
+            super(pin ? "pin" : "unpin");
+            this.config = config;
+            this.pin = pin;
+        }
+
+        @Override
+        public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+            try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                // @formatter:off
+                // if (currentThread::_cont_entry != null)
+                //   uint pin_count = currentThread::_cont_entry::_pin_count;
+                //   if (pin_count == (pin ? 0xFFFFFFFFUL : 0)) deoptimize;
+                //   else currentThread::_cont_entry::_pin_count = pin_count + (pin ? 1 : -1);
+                // @formatter:on
+                StructuredGraph graph = b.getGraph();
+                CurrentJavaThreadNode javaThread = graph.addOrUniqueWithInputs(new CurrentJavaThreadNode(helper.getWordKind()));
+
+                GraalError.guarantee(config.contEntry != -1, "JavaThread::_cont_entry is not exported");
+                OffsetAddressNode lastContinuationAddr = graph.addOrUniqueWithInputs(new OffsetAddressNode(javaThread, helper.asWord(config.contEntry)));
+                ValueNode lastContinuation = b.add(new JavaReadNode(JavaKind.Object, lastContinuationAddr, HOTSPOT_JAVA_THREAD_CONT_ENTRY, BarrierType.NONE, MemoryOrderMode.PLAIN, false));
+                ValueNode nonNullLastContinuation = helper.emitNullReturnGuard(lastContinuation, null, NOT_FREQUENT_PROBABILITY);
+
+                GraalError.guarantee(config.pinCount != -1, "ContinuationEntry::_pin_count is not exported");
+                OffsetAddressNode pinCountAddr = graph.addOrUniqueWithInputs(new OffsetAddressNode(nonNullLastContinuation, helper.asWord(config.pinCount)));
+                ValueNode pinCount = b.add(new JavaReadNode(JavaKind.Int, pinCountAddr, HOTSPOT_CONTINUATION_ENTRY_PIN_COUNT, BarrierType.NONE, MemoryOrderMode.PLAIN, false));
+
+                LogicNode overFlow = IntegerEqualsNode.create(pinCount, pin ? ConstantNode.forInt(-1) : ConstantNode.forInt(0), NodeView.DEFAULT);
+                // TypeCheckedInliningViolated (Reason_type_checked_inlining) is aliasing
+                // Reason_intrinsic
+                b.append(new FixedGuardNode(overFlow, TypeCheckedInliningViolated, DeoptimizationAction.None, true));
+                ValueNode newPinCount = b.add(AddNode.create(pinCount, pin ? ConstantNode.forInt(1) : ConstantNode.forInt(-1), NodeView.DEFAULT));
+                b.add(new JavaWriteNode(JavaKind.Int, pinCountAddr, HOTSPOT_CONTINUATION_ENTRY_PIN_COUNT, newPinCount, BarrierType.NONE, false));
+                helper.emitFinalReturn(JavaKind.Void, null);
+            }
+            return true;
+        }
+    }
+
+    private static void registerContinuationPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        Registration r = new Registration(plugins, "jdk.internal.vm.Continuation", replacements);
+        if (JavaVersionUtil.JAVA_SPEC >= 24) {
+            r.register(new ContinuationPinningPlugin(config, true));
+            r.register(new ContinuationPinningPlugin(config, false));
+        }
+    }
+
     private static void registerVirtualThreadPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
         Registration r = new Registration(plugins, "java.lang.VirtualThread", replacements);
         if (config.supportJVMTIVThreadNotification()) {
@@ -1374,7 +1432,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                     ValueNode layoutHelperLong = b.add(SignExtendNode.create(layoutHelper, JavaKind.Long.getBitCount(), NodeView.DEFAULT));
                     ValueNode instanceSizeLong = b.add(AndNode.create(layoutHelperLong, ConstantNode.forLong(-((long) JavaKind.Long.getByteCount())), NodeView.DEFAULT));
 
-                    b.add(new IfNode(isArray, arrayLengthNode, instanceBranch, BranchProbabilityData.injected(0.5D)));
+                    b.add(new IfNode(isArray, arrayLengthNode, instanceBranch, injected(0.5D)));
                     MergeNode merge = b.append(new MergeNode());
                     merge.addForwardEnd(arrayBranch);
                     merge.addForwardEnd(instanceBranch);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java

@@ -40,6 +40,7 @@
 
 import java.util.function.Function;
 
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
@@ -202,9 +203,9 @@ public ValueNode readKlassSuperKlass(PiNode klassNonNull) {
         return readLocation(klassNonNull, HotSpotVMConfigField.KLASS_SUPER_KLASS_OFFSET);
     }
 
-    public PiNode emitNullReturnGuard(ValueNode klass, ValueNode returnValue, double probability) {
-        GuardingNode nonnullGuard = emitReturnIf(IsNullNode.create(klass), returnValue, probability);
-        return piCast(klass, nonnullGuard, KlassPointerStamp.klassNonNull());
+    public PiNode emitNullReturnGuard(ValueNode pointer, ValueNode returnValue, double probability) {
+        GuardingNode nonnullGuard = emitReturnIf(IsNullNode.create(pointer), returnValue, probability);
+        return piCast(pointer, nonnullGuard, ((AbstractPointerStamp) pointer.stamp(NodeView.DEFAULT)).asNonNull());
     }
 
     /**

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReplacementsUtil.java

@@ -901,6 +901,9 @@ public static NamedLocationIdentity mutable(String name) {
     public static final LocationIdentity HOTSPOT_JAVA_THREAD_IS_IN_TMP_VTMS_TRANSITION = NamedLocationIdentity.mutable("JavaThread::_is_in_tmp_VTMS_transition");
     public static final LocationIdentity HOTSPOT_JAVA_THREAD_IS_DISABLE_SUSPEND = NamedLocationIdentity.mutable("JavaThread::_is_disable_suspend");
     public static final LocationIdentity HOTSPOT_JAVA_LANG_THREAD_IS_IN_VTMS_TRANSITION = NamedLocationIdentity.mutable("Thread::_is_in_VTMS_transition");
+    public static final LocationIdentity HOTSPOT_JAVA_THREAD_CONT_ENTRY = NamedLocationIdentity.mutable("JavaThread::_cont_entry");
+
+    public static final LocationIdentity HOTSPOT_CONTINUATION_ENTRY_PIN_COUNT = NamedLocationIdentity.mutable("ContinuationEntry::_pin_count");
 
     @Fold
     public static int layoutHelperHeaderSizeShift(@InjectedParameter GraalHotSpotVMConfig config) {

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -3281,6 +3281,10 @@ def __init__(self, component, language_library_config, jvm_standalone=None, **kw
             **kwargs
         )
 
+    def isJDKDependent(self):
+        # because of -DLAUNCHER_JDK_VERSION (GR-57817)
+        return True
+
     @staticmethod
     def library_launcher_project_name(language_library_config, for_jvm_standalone=False):
         return "org.graalvm.launcher.native." + ("jvm_standalone." if for_jvm_standalone else "") + language_library_config.language
@@ -3298,6 +3302,8 @@ def cflags(self):
             '-DCP_SEP=' + os.pathsep,
             '-DDIR_SEP=' + ('\\\\' if mx.is_windows() else '/'),
             '-DGRAALVM_VERSION=' + _suite.release_version(),
+            # Might not be needed anymore if GR-57817 gets fixed.
+            f'-DLAUNCHER_JDK_VERSION={mx_sdk_vm.base_jdk_version()}',
         ]
         if not mx.is_windows():
             _dynamic_cflags += ['-pthread']

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");
+#if LAUNCHER_JDK_VERSION > 21
+        /* Ignore illegal native access until is GR-57817 fixed. */
+        vmArgs.push_back("--illegal-native-access=allow");
+#endif
     }
 
     jint nOptions = jvmMode ? vmArgs.size() : 1 + vmArgs.size();

substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/Target_java_lang_foreign_SymbolLookup.java

@@ -142,7 +142,7 @@ static void ensureNativeAccess(Class<?> currentClass, Class<?> owner, String met
         if (JavaVersionUtil.JAVA_SPEC <= 21) {
             module.ensureNativeAccess(owner, methodName);
         } else {
-            module.ensureNativeAccess(owner, methodName, currentClass);
+            module.ensureNativeAccess(owner, methodName, currentClass, false);
         }
 
     }

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixNativeLibraryFeature.java

@@ -133,6 +133,7 @@ protected void loadJavaLibrary() {
         Target_java_io_UnixFileSystem_JNI.initIDs();
     }
 
+    @SuppressWarnings("restricted")
     private static void loadNetLibrary() {
         if (Isolates.isCurrentFirst()) {
             /*