Skip to content
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.

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

[GR-61772] Update labsjdk to 25+8-jvmci-b01 #10605

Merged
merged 35 commits into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ae5d18d
Automatic merge of master into galahad
OracleLabsAutomation Jan 23, 2025
92e84f1
Automatic merge of master into galahad
OracleLabsAutomation Jan 23, 2025
c5c1d4e
Automatic merge of master into galahad
OracleLabsAutomation Jan 23, 2025
af7d654
Automatic merge of master into galahad
OracleLabsAutomation Jan 23, 2025
fe03bee
Automatic merge of master into galahad
OracleLabsAutomation Jan 23, 2025
836b6ea
Automatic merge of master into galahad
OracleLabsAutomation Jan 23, 2025
0530e5c
Automatic merge of master into galahad
OracleLabsAutomation Jan 24, 2025
a691fb8
Automatic merge of master into galahad
OracleLabsAutomation Jan 24, 2025
107b03f
Automatic merge of master into galahad
OracleLabsAutomation Jan 24, 2025
5d6f0ff
Automatic merge of master into galahad
OracleLabsAutomation Jan 24, 2025
e0ba5cb
Automatic merge of master into galahad
OracleLabsAutomation Jan 24, 2025
95ed773
Automatic merge of master into galahad
OracleLabsAutomation Jan 24, 2025
510df67
Automatic merge of master into galahad
OracleLabsAutomation Jan 25, 2025
5629bd2
Adapt JDK-8343962: [REDO] Move getChars to DecimalDigits
mur47x111 Jan 25, 2025
e1496d7
Automatic merge of master into galahad
OracleLabsAutomation Jan 25, 2025
4e09bc2
Automatic merge of master into galahad
OracleLabsAutomation Jan 26, 2025
0b21b50
[JDK-8348613] Adapt JDK-8343962: [REDO] Move getChars to DecimalDigits
mur47x111 Jan 27, 2025
7d28dd4
Automatic merge of master into galahad
OracleLabsAutomation Jan 27, 2025
35f8157
Automatic merge of master into galahad
OracleLabsAutomation Jan 27, 2025
39e9f3a
Automatic merge of master into galahad
OracleLabsAutomation Jan 27, 2025
5ba852c
Automatic merge of master into galahad
OracleLabsAutomation Jan 27, 2025
502eddb
Automatic merge of master into galahad
OracleLabsAutomation Jan 28, 2025
1e13c97
Automatic merge of master into galahad
OracleLabsAutomation Jan 28, 2025
ac8f5d6
Automatic merge of master into galahad
OracleLabsAutomation Jan 28, 2025
46985fa
Automatic merge of master into galahad
OracleLabsAutomation Jan 28, 2025
da3736c
Automatic merge of master into galahad
OracleLabsAutomation Jan 28, 2025
9bb9fcc
Automatic merge of master into galahad
OracleLabsAutomation Jan 29, 2025
eacb6fb
Automatic merge of master into galahad
OracleLabsAutomation Jan 29, 2025
8f91731
Automatic merge of master into galahad
OracleLabsAutomation Jan 29, 2025
48e7388
Automatic merge of master into galahad
OracleLabsAutomation Jan 30, 2025
7890af0
update JVMCI to 25+8-jvmci-b01
OracleLabsAutomation Jan 30, 2025
4cc8dd5
compiler: update JVMCIVersionCheck
zapster Jan 31, 2025
17c5213
Merge tag 'jdk-25+8'
zapster Jan 31, 2025
56a4a35
svm: review libcontainer changes for JDK 25+8
zapster Jan 31, 2025
4b0a4fc
deploy labsjdk snapshots
marwan-hallaoui Jan 31, 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
Original file line number Diff line number Diff line change
Expand Up @@ -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": "25", "build_id": "jdk-25+6-477", "platformspecific": true, "extrabundles": ["static-libs"]},
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+8-767", "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 },
Expand Down Expand Up @@ -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": "25", "build_id": "jdk-25+7", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+7-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+7-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+7-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+7-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+7-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+7-jvmci-b01-sulong", "platformspecific": true }
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+8", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+8-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+8-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+8-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+8-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+8-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+8-jvmci-b01-sulong", "platformspecific": true }
},

"eclipse": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,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)),
"25", Map.of(
"Oracle Corporation", createLabsJDKVersion("25+7", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+7", 1)));
"Oracle Corporation", createLabsJDKVersion("25+8", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+8", 1)));
private static final int NA = 0;
/**
* Minimum Java release supported by Graal.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/os/linux/osContainer_linux.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/os/linux/osContainer_linux.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+7/src/hotspot/os/linux/os_linux.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/os/linux/os_linux.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+8/src/hotspot/os/linux/os_linux.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+8/src/hotspot/os/linux/os_linux.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/os/linux/os_linux.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/os/posix/include/jvm_md.h")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+7/src/hotspot/os/posix/os_posix.cpp")
Expand All @@ -71,7 +71,7 @@
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/share/memory/allocation.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/share/memory/allStatic.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/share/nmt/memTag.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+7/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+8/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/share/runtime/os.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/share/runtime/os.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/hotspot/share/utilities/checkedCast.hpp")
Expand Down