Skip to content

[GR-70972] Update labsjdk to 25.0.1+8-jvmci-25.1-b08 #12444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 29, 2025
Merged

[GR-70972] Update labsjdk to 25.0.1+8-jvmci-25.1-b08 #12444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccbf981
update JVMCI to 25.0.1+8-jvmci-25.1-b08
OracleLabsAutomation Oct 27, 2025
ab607f1
Adapt to JDK-8367031: LocalDate.month & day are shorts again
gilles-duboscq Oct 2, 2025
e860494
compiler : fix JVMCIVersionCheck --as-tag output
marwan-hallaoui Oct 28, 2025
bd13b5d
deploy labsjdk snapshots
marwan-hallaoui Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@

"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},

"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },

"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+37-jvmci-25.1-b07", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+37-jvmci-25.1-b07-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+37-jvmci-25.1-b07-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+37-jvmci-25.1-b07", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+37-jvmci-25.1-b07-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+37-jvmci-25.1-b07-sulong", "platformspecific": true }
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08-sulong", "platformspecific": true }
},

"eclipse": {
Expand Down
3 changes: 1 addition & 2 deletions ...rc/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ public void testMinVersionAsTag() {
String out = runMainCaptureOut("--min-version", "--as-tag");
Assert.assertNotNull(out);
Assert.assertFalse(out.contains("No minimum JVMCI version specified for JDK version"));
// check that the output is a valid version
Runtime.Version.parse(out.strip());
Assert.assertTrue(out.startsWith("jvmci-"));
}

@Test(expected = IllegalArgumentException.class)
Expand Down
20 changes: 14 additions & 6 deletions compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public final class JVMCIVersionCheck {
// Checkstyle: stop stable iteration order check
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
"25", Map.of(
"Oracle Corporation", createLabsJDKVersion("25+37", "25.1", 7),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+37", "25.1", 7)));
"Oracle Corporation", createLabsJDKVersion("25.0.1+8", "25.1", 8),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25.0.1+8", "25.1", 8)));
// Checkstyle: resume stable iteration order check

private static final int NA = 0;
Expand Down Expand Up @@ -246,17 +246,17 @@ public int hashCode() {
return Objects.hashCode(this.jdkVersion) ^ Objects.hashCode(this.releaseName) ^ this.jvmciBuild;
}

public static final String AS_TAG_FORMAT_RELEASE_NAME = "%s-jvmci-%s-b%02d";
public static final String AS_TAG_FORMAT_RELEASE_NAME = "jvmci-%s-b%02d";
public static final String TO_STRING_FORMAT_RELEASE_NAME = "%s-jvmci-%s-b%02d";
public static final String AS_TAG_FORMAT_22_AND_LATER = "%s-jvmci-b%02d";
public static final String AS_TAG_FORMAT_21_AND_EARLIER = "jvmci-%d.%d-b%02d";

@Override
public String toString() {
if (isOpenJDK()) {
return jdkVersion.toString();
}
if (releaseName != null) {
return String.format(AS_TAG_FORMAT_RELEASE_NAME, jdkVersion, releaseName, jvmciBuild);
return String.format(TO_STRING_FORMAT_RELEASE_NAME, jdkVersion, releaseName, jvmciBuild);
} else {
return String.format(AS_TAG_FORMAT_22_AND_LATER, jdkVersion, jvmciBuild);
}
Expand All @@ -265,7 +265,15 @@ public String toString() {
public String printFormat(PrintFormat format) {
return switch (format) {
case TUPLE -> String.format("%s,%s,%d", jdkVersion, releaseName, jvmciBuild);
case AS_TAG -> toString();
case AS_TAG -> {
if (isOpenJDK()) {
yield jdkVersion.toString();
} else if (releaseName != null) {
yield String.format(AS_TAG_FORMAT_RELEASE_NAME, releaseName, jvmciBuild);
} else {
yield String.format(AS_TAG_FORMAT_22_AND_LATER, jdkVersion, jvmciBuild);
}
}
};
}

Expand Down
10 changes: 2 additions & 8 deletions espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,14 +1007,8 @@ public Meta(EspressoContext context) {

java_time_LocalDate = knownKlass(Types.java_time_LocalDate);
java_time_LocalDate_year = java_time_LocalDate.requireDeclaredField(Names.year, Types._int);
java_time_LocalDate_month = diff() //
.field(VERSION_24_OR_LOWER, Names.month, Types._short) //
.field(VERSION_25_OR_HIGHER, Names.month, Types._byte) //
.field(java_time_LocalDate);
java_time_LocalDate_day = diff() //
.field(VERSION_24_OR_LOWER, Names.day, Types._short) //
.field(VERSION_25_OR_HIGHER, Names.day, Types._byte) //
.field(java_time_LocalDate);
java_time_LocalDate_month = java_time_LocalDate.requireDeclaredField(Names.month, Types._short);
java_time_LocalDate_day = java_time_LocalDate.requireDeclaredField(Names.day, Types._short);
java_time_LocalDate_of = java_time_LocalDate.requireDeclaredMethod(Names.of, Signatures.LocalDate_int_int_int);

java_time_ZonedDateTime = knownKlass(Types.java_time_ZonedDateTime);
Expand Down