Skip to content

[GR-68961] Update labsjdk to 26+12-jvmci-b01 #12042

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 6 commits into from
Aug 27, 2025
Merged

[GR-68961] Update labsjdk to 26+12-jvmci-b01 #12042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc3aa2c
update JVMCI to 26+12-jvmci-b01
OracleLabsAutomation Aug 22, 2025
3df9e16
[Graal] Adapt JDK-8361842: Move input validation checks to Java for j…
mur47x111 Jul 17, 2025
f084a1b
svm: review libcontainer changes for 26+12
zapster Aug 22, 2025
4a9b16e
Update EncodeArrayTest (JDK-8361842)
mur47x111 Aug 22, 2025
82fcbc2
deploy labsjdk snapshots
marwan-hallaoui Aug 22, 2025
e99852b
Merge remote-tracking branch 'origin/master' into labsjdk/adopt-26+12…
gilles-duboscq Aug 26, 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "33", "platformspecific": true },

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

"eclipse": {
Expand Down
6 changes: 3 additions & 3 deletions ...src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EncodeArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private static Result executeCompiledMethod(InstalledCode compiledMethod, Object
@Test
public void testStringCodingISO() throws ClassNotFoundException {
Class<?> klass = Class.forName("java.lang.StringCoding");
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "implEncodeISOArray");
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "encodeISOArray0");
StructuredGraph graph = getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), StructuredGraph.AllowAssumptions.YES, null);
InstalledCode compiledMethod = getCode(method, graph);

Expand Down Expand Up @@ -100,7 +100,7 @@ public void testStringCodingISO() throws ClassNotFoundException {
@Test
public void testStringCodingAscii() throws ClassNotFoundException {
Class<?> klass = Class.forName("java.lang.StringCoding");
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "implEncodeAsciiArray");
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "encodeAsciiArray0");
StructuredGraph graph = getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), StructuredGraph.AllowAssumptions.YES, null);
InstalledCode compiledMethod = getCode(method, graph);

Expand Down Expand Up @@ -133,7 +133,7 @@ public void testStringCodingAscii() throws ClassNotFoundException {
@Test
public void testISOEncoding() throws ClassNotFoundException {
Class<?> klass = Class.forName("sun.nio.cs.ISO_8859_1$Encoder");
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "implEncodeISOArray");
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "encodeISOArray0");
StructuredGraph graph = getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), StructuredGraph.AllowAssumptions.YES, null);
InstalledCode compiledMethod = getCode(method, graph);

Expand Down
4 changes: 2 additions & 2 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 @@ -57,8 +57,8 @@ public final class JVMCIVersionCheck {
// Checkstyle: stop stable iteration order check
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
"26", Map.of(
"Oracle Corporation", createLabsJDKVersion("26+11", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+11", 1)));
"Oracle Corporation", createLabsJDKVersion("26+12", 1),
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+12", 1)));
// Checkstyle: resume stable iteration order check

private static final int NA = 0;
Expand Down
15 changes: 4 additions & 11 deletions ...c/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2621,7 +2621,7 @@ public boolean isApplicable(Architecture arch) {

private static void registerStringCodingPlugins(InvocationPlugins plugins) {
Registration r = new Registration(plugins, "java.lang.StringCoding");
r.register(new InvocationPlugin("implEncodeISOArray", byte[].class, int.class, byte[].class, int.class, int.class) {
r.register(new InvocationPlugin("encodeISOArray0", byte[].class, int.class, byte[].class, int.class, int.class) {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
ValueNode da, ValueNode dp, ValueNode len) {
Expand All @@ -2634,7 +2634,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
}
}
});
r.register(new InvocationPlugin("implEncodeAsciiArray", char[].class, int.class, byte[].class, int.class, int.class) {
r.register(new InvocationPlugin("encodeAsciiArray0", char[].class, int.class, byte[].class, int.class, int.class) {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
ValueNode da, ValueNode dp, ValueNode len) {
Expand All @@ -2646,17 +2646,10 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
}
}
});
r.register(new InvocationPlugin("countPositives", byte[].class, int.class, int.class) {
r.register(new InvocationPlugin("countPositives0", byte[].class, int.class, int.class) {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode ba, ValueNode off, ValueNode len) {
try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
helper.intrinsicRangeCheck(off, Condition.LT, ConstantNode.forInt(0));
helper.intrinsicRangeCheck(len, Condition.LT, ConstantNode.forInt(0));

ValueNode arrayLength = b.add(new ArrayLengthNode(ba));
ValueNode limit = b.add(AddNode.create(off, len, NodeView.DEFAULT));
helper.intrinsicRangeCheck(arrayLength, Condition.LT, limit);

ValueNode array = helper.arrayElementPointer(ba, JavaKind.Byte, off);
b.addPush(JavaKind.Int, new CountPositivesNode(array, len));
return true;
Expand All @@ -2665,7 +2658,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
});

r = new Registration(plugins, "sun.nio.cs.ISO_8859_1$Encoder");
r.register(new InvocationPlugin("implEncodeISOArray", char[].class, int.class, byte[].class, int.class, int.class) {
r.register(new InvocationPlugin("encodeISOArray0", char[].class, int.class, byte[].class, int.class, int.class) {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
ValueNode da, ValueNode dp, ValueNode len) {
Expand Down
4 changes: 2 additions & 2 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allocation.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allStatic.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+5/src/hotspot/share/nmt/memTag.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+6/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+12/src/hotspot/share/runtime/os.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/runtime/os.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/runtime/os.inline.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/checkedCast.hpp")
Expand All @@ -86,7 +86,7 @@
// The following annotations are for files in `src/svm`, which are completely customized for SVM
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/logging/log.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allocation.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/runtime/globals.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+12/src/hotspot/share/runtime/globals.hpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/debug.cpp")
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/debug.hpp")
public class ContainerLibrary {
Expand Down