Skip to content

[GR-66295] Update labsjdk to 26+3-jvmci-b01. #11456

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

Merged
merged 36 commits into from
Jun 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2fddc15
Automatic merge of master into galahad
OracleLabsAutomation Jun 12, 2025
383dcde
Automatic merge of master into galahad
OracleLabsAutomation Jun 12, 2025
851423e
Automatic merge of master into galahad
OracleLabsAutomation Jun 12, 2025
10c7982
Automatic merge of master into galahad
OracleLabsAutomation Jun 12, 2025
3e9c301
Automatic merge of master into galahad
OracleLabsAutomation Jun 13, 2025
54a11b3
Automatic merge of master into galahad
OracleLabsAutomation Jun 13, 2025
dfaf90d
Automatic merge of master into galahad
OracleLabsAutomation Jun 13, 2025
fd637d7
Automatic merge of master into galahad
OracleLabsAutomation Jun 13, 2025
a77f9a8
Automatic merge of master into galahad
OracleLabsAutomation Jun 14, 2025
91ee6d9
Automatic merge of master into galahad
OracleLabsAutomation Jun 15, 2025
da4df75
Automatic merge of master into galahad
OracleLabsAutomation Jun 16, 2025
1c927b6
Automatic merge of master into galahad
OracleLabsAutomation Jun 16, 2025
e7e8ec2
Automatic merge of master into galahad
OracleLabsAutomation Jun 16, 2025
7919717
Automatic merge of master into galahad
OracleLabsAutomation Jun 17, 2025
9a5ba8f
Automatic merge of master into galahad
OracleLabsAutomation Jun 17, 2025
36c5afc
Automatic merge of master into galahad
OracleLabsAutomation Jun 17, 2025
09df625
Automatic merge of master into galahad
OracleLabsAutomation Jun 17, 2025
ef06f01
Automatic merge of master into galahad
OracleLabsAutomation Jun 17, 2025
970d9cc
Automatic merge of master into galahad
OracleLabsAutomation Jun 17, 2025
de148ed
Automatic merge of master into galahad
OracleLabsAutomation Jun 17, 2025
b240a09
Automatic merge of master into galahad
OracleLabsAutomation Jun 18, 2025
f4019a8
Automatic merge of master into galahad
OracleLabsAutomation Jun 18, 2025
805d48f
Automatic merge of master into galahad
OracleLabsAutomation Jun 18, 2025
55f45b5
Automatic merge of master into galahad
OracleLabsAutomation Jun 18, 2025
2496710
Automatic merge of master into galahad
OracleLabsAutomation Jun 19, 2025
bf1ea56
Automatic merge of master into galahad
OracleLabsAutomation Jun 19, 2025
7135fbd
Automatic merge of master into galahad
OracleLabsAutomation Jun 19, 2025
5da8720
update JVMCI to 26+3-jvmci-b01
OracleLabsAutomation Jun 20, 2025
2e23633
Merge tag 'jdk-26+3' into labsjdk/adopt-26+3-master
jovanstevanovic Jun 23, 2025
2cd1ebf
Update JVMCI version.
jovanstevanovic Jun 23, 2025
8911544
Update BasedOnJDK annotation.
jovanstevanovic Jun 23, 2025
c7b2f06
Fix incorrect snapshot hash values.
jovanstevanovic Jun 23, 2025
19d1832
Complet BasedOnJDK annotation update.
jovanstevanovic Jun 23, 2025
7d3dc5f
deploy labsjdk snapshots
marwan-hallaoui Jun 23, 2025
f14a240
Fixed privileged methods list.
tzezula Jun 23, 2025
e01e0f2
JDK-8349550: Do not pull SecureRandom into image heap.
jovanstevanovic Jun 23, 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
14 changes: 7 additions & 7 deletions common.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@

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

"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+2", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01-sulong", "platformspecific": true }
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+3", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01-sulong", "platformspecific": true }
},

"eclipse": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
*/
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
"26", Map.of(
"Oracle Corporation", createLabsJDKVersion("26+2", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+2", 1)));
"Oracle Corporation", createLabsJDKVersion("26+3", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+3", 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 @@ -85,8 +85,8 @@
// The following annotations are for files in `src/svm`, which are completely customized for SVM
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/logging/log.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+26/src/hotspot/share/memory/allocation.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+26/src/hotspot/share/runtime/globals.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/utilities/debug.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+3/src/hotspot/share/runtime/globals.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+3/src/hotspot/share/utilities/debug.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.hpp")
public class ContainerLibrary {
static final int VERSION = 240100;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import com.oracle.svm.core.util.VMError;

@TargetClass(className = "java.nio.DirectByteBuffer")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+26/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+3/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template")
public final class Target_java_nio_DirectByteBuffer {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
@SuppressWarnings("javadoc")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+7/src/hotspot/share/prims/nativeEntryPoint.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+17/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+3/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp")
class DowncallStub extends NonBytecodeMethod {
public static Signature createSignature(MetaAccessProvider metaAccess) {
return ResolvedSignature.fromKinds(new JavaKind[]{JavaKind.Object}, JavaKind.Object, metaAccess);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,14 @@ public void duringSetup(DuringSetupAccess a) {
rci.initializeAtRunTime(NativePRNG.Blocking.class, "for substitutions");
rci.initializeAtRunTime(NativePRNG.NonBlocking.class, "for substitutions");

/*
* The following classes will pull a SecureRandom instance into the image heap, so we need
* to explicitly move them to a run time.
*/
rci.initializeAtRunTime(clazz(access, "com.sun.security.sasl.CramMD5Server"), "for substitutions");
rci.initializeAtRunTime(clazz(access, "com.sun.security.sasl.digest.DigestMD5Base"), "for substitutions");
rci.initializeAtRunTime(clazz(access, "com.sun.security.sasl.digest.DigestMD5Client"), "for substitutions");

rci.initializeAtRunTime(clazz(access, "sun.security.provider.SeedGenerator"), "for substitutions");
rci.initializeAtRunTime(clazz(access, "sun.security.provider.SecureRandom$SeederHolder"), "for substitutions");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1072,13 +1072,6 @@
"parameterTypes": [
"java.net.DatagramPacket"
]
},
{
"name": "send",
"parameterTypes": [
"java.net.DatagramPacket",
"byte"
]
}
]
},
Expand Down