[GR-60401] Update labsjdk to 25+1-jvmci-b01

PullRequest: graal/19566
chrischiedo · Dec 12, 2024 · b2b3de3 · b2b3de3
2 parents 0284e28 + 313f008
commit b2b3de3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/common.json b/common.json
@@ -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+27", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+27-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+27-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+27-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+27-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+27-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+27-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+1", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+1-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+1-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+1-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+1-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+1-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+1-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
@@ -182,6 +182,8 @@ def _capture_jvmci_version(args=None):
         if out.data:
             try:
                 (jdk_version, jvmci_major, jvmci_minor, jvmci_build) = out.data.split(',')
+                if jdk_version.endswith('-LTS'):
+                    jdk_version = jdk_version[:-len('-LTS')]
                 return JVMCIVersionCheckVersion(JavaLangRuntimeVersion(jdk_version), int(jvmci_major), int(jvmci_minor), int(jvmci_build))
             except ValueError:
                 mx.warn(f'Could not parse jvmci version from JVMCIVersionCheck output:\n{out.data}')

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

diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
@@ -169,8 +169,8 @@ public final class TruffleBaseFeature implements InternalFeature {
 
     private static final String NATIVE_IMAGE_FILELIST_FILE_NAME = "native-image-resources.filelist";
 
-    private static final Version NEXT_POLYGLOT_VERSION_UPDATE = Version.create(25, 1);
-    private static final int MAX_JDK_VERSION = 25;
+    private static final Version NEXT_POLYGLOT_VERSION_UPDATE = Version.create(29, 1);
+    private static final int MAX_JDK_VERSION = 29;
 
     @Override
     public String getURL() {

diff --git a/...rc/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java b/...rc/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java
@@ -168,8 +168,8 @@ public abstract class OptimizedTruffleRuntime implements TruffleRuntime, Truffle
     private static final int JAVA_SPECIFICATION_VERSION = Runtime.version().feature();
     public static final Version MIN_COMPILER_VERSION = Version.create(23, 1, 2);
     public static final int MIN_JDK_VERSION = 21;
-    public static final int MAX_JDK_VERSION = 25;
-    public static final Version NEXT_VERSION_UPDATE = Version.create(25, 1);
+    public static final int MAX_JDK_VERSION = 29;
+    public static final Version NEXT_VERSION_UPDATE = Version.create(29, 1);
 
     /**
      * Used only to reset state for native image compilation.