Skip to content

Commit b2b3de3

Browse files
marwan-hallaouizapster
authored andcommitted
[GR-60401] Update labsjdk to 25+1-jvmci-b01
PullRequest: graal/19566
2 parents 0284e28 + 313f008 commit b2b3de3

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

common.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+27", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+27-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+27-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+27-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+27-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+27-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+27-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+1", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+1-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+1-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+1-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+1-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+1-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+1-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

compiler/mx.compiler/mx_compiler.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ def _capture_jvmci_version(args=None):
182182
if out.data:
183183
try:
184184
(jdk_version, jvmci_major, jvmci_minor, jvmci_build) = out.data.split(',')
185+
if jdk_version.endswith('-LTS'):
186+
jdk_version = jdk_version[:-len('-LTS')]
185187
return JVMCIVersionCheckVersion(JavaLangRuntimeVersion(jdk_version), int(jvmci_major), int(jvmci_minor), int(jvmci_build))
186188
except ValueError:
187189
mx.warn(f'Could not parse jvmci version from JVMCIVersionCheck output:\n{out.data}')

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public final class JVMCIVersionCheck {
5454
*/
5555
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5656
"21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
57-
"24", Map.of(
58-
"Oracle Corporation", createLabsJDKVersion("24+27", 1),
59-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("24+27", 1)));
57+
"25", Map.of(
58+
"Oracle Corporation", createLabsJDKVersion("25+1", 1),
59+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+1", 1)));
6060
private static final int NA = 0;
6161
/**
6262
* Minimum Java release supported by Graal.

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ public final class TruffleBaseFeature implements InternalFeature {
169169

170170
private static final String NATIVE_IMAGE_FILELIST_FILE_NAME = "native-image-resources.filelist";
171171

172-
private static final Version NEXT_POLYGLOT_VERSION_UPDATE = Version.create(25, 1);
173-
private static final int MAX_JDK_VERSION = 25;
172+
private static final Version NEXT_POLYGLOT_VERSION_UPDATE = Version.create(29, 1);
173+
private static final int MAX_JDK_VERSION = 29;
174174

175175
@Override
176176
public String getURL() {

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ public abstract class OptimizedTruffleRuntime implements TruffleRuntime, Truffle
168168
private static final int JAVA_SPECIFICATION_VERSION = Runtime.version().feature();
169169
public static final Version MIN_COMPILER_VERSION = Version.create(23, 1, 2);
170170
public static final int MIN_JDK_VERSION = 21;
171-
public static final int MAX_JDK_VERSION = 25;
172-
public static final Version NEXT_VERSION_UPDATE = Version.create(25, 1);
171+
public static final int MAX_JDK_VERSION = 29;
172+
public static final Version NEXT_VERSION_UPDATE = Version.create(29, 1);
173173

174174
/**
175175
* Used only to reset state for native image compilation.

0 commit comments

Comments
 (0)