Skip to content

Commit 2a65da5

Browse files
OracleLabsAutomationzapster
OracleLabsAutomation
authored and
zapster
committed
[GR-68961] Update labsjdk to 26+12-jvmci-b01
PullRequest: graal/21931
2 parents 58ebbc8 + e99852b commit 2a65da5

File tree

5 files changed

+18
-25
lines changed

5 files changed

+18
-25
lines changed

‎common.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
5555
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "33", "platformspecific": true },
5656

57-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+11", "platformspecific": true, "extrabundles": ["static-libs"]},
58-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+11-jvmci-b01", "platformspecific": true },
59-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+11-jvmci-b01-debug", "platformspecific": true },
60-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+11-jvmci-b01-sulong", "platformspecific": true },
61-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+11-jvmci-b01", "platformspecific": true },
62-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+11-jvmci-b01-debug", "platformspecific": true },
63-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+11-jvmci-b01-sulong", "platformspecific": true }
57+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+12", "platformspecific": true, "extrabundles": ["static-libs"]},
58+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01", "platformspecific": true },
59+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-debug", "platformspecific": true },
60+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-sulong", "platformspecific": true },
61+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01", "platformspecific": true },
62+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-debug", "platformspecific": true },
63+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-sulong", "platformspecific": true }
6464
},
6565

6666
"eclipse": {

‎compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EncodeArrayTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private static Result executeCompiledMethod(InstalledCode compiledMethod, Object
6767
@Test
6868
public void testStringCodingISO() throws ClassNotFoundException {
6969
Class<?> klass = Class.forName("java.lang.StringCoding");
70-
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "implEncodeISOArray");
70+
ResolvedJavaMethod method = getResolvedJavaMethod(klass, "encodeISOArray0");
7171
StructuredGraph graph = getIntrinsicGraph(method, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext(), StructuredGraph.AllowAssumptions.YES, null);
7272
InstalledCode compiledMethod = getCode(method, graph);
7373

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public final class JVMCIVersionCheck {
5757
// Checkstyle: stop stable iteration order check
5858
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5959
"26", Map.of(
60-
"Oracle Corporation", createLabsJDKVersion("26+11", 1),
61-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+11", 1)));
60+
"Oracle Corporation", createLabsJDKVersion("26+12", 1),
61+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+12", 1)));
6262
// Checkstyle: resume stable iteration order check
6363

6464
private static final int NA = 0;

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,7 +2621,7 @@ public boolean isApplicable(Architecture arch) {
26212621

26222622
private static void registerStringCodingPlugins(InvocationPlugins plugins) {
26232623
Registration r = new Registration(plugins, "java.lang.StringCoding");
2624-
r.register(new InvocationPlugin("implEncodeISOArray", byte[].class, int.class, byte[].class, int.class, int.class) {
2624+
r.register(new InvocationPlugin("encodeISOArray0", byte[].class, int.class, byte[].class, int.class, int.class) {
26252625
@Override
26262626
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
26272627
ValueNode da, ValueNode dp, ValueNode len) {
@@ -2634,7 +2634,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
26342634
}
26352635
}
26362636
});
2637-
r.register(new InvocationPlugin("implEncodeAsciiArray", char[].class, int.class, byte[].class, int.class, int.class) {
2637+
r.register(new InvocationPlugin("encodeAsciiArray0", char[].class, int.class, byte[].class, int.class, int.class) {
26382638
@Override
26392639
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
26402640
ValueNode da, ValueNode dp, ValueNode len) {
@@ -2646,17 +2646,10 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
26462646
}
26472647
}
26482648
});
2649-
r.register(new InvocationPlugin("countPositives", byte[].class, int.class, int.class) {
2649+
r.register(new InvocationPlugin("countPositives0", byte[].class, int.class, int.class) {
26502650
@Override
26512651
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode ba, ValueNode off, ValueNode len) {
26522652
try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
2653-
helper.intrinsicRangeCheck(off, Condition.LT, ConstantNode.forInt(0));
2654-
helper.intrinsicRangeCheck(len, Condition.LT, ConstantNode.forInt(0));
2655-
2656-
ValueNode arrayLength = b.add(new ArrayLengthNode(ba));
2657-
ValueNode limit = b.add(AddNode.create(off, len, NodeView.DEFAULT));
2658-
helper.intrinsicRangeCheck(arrayLength, Condition.LT, limit);
2659-
26602653
ValueNode array = helper.arrayElementPointer(ba, JavaKind.Byte, off);
26612654
b.addPush(JavaKind.Int, new CountPositivesNode(array, len));
26622655
return true;
@@ -2665,7 +2658,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
26652658
});
26662659

26672660
r = new Registration(plugins, "sun.nio.cs.ISO_8859_1$Encoder");
2668-
r.register(new InvocationPlugin("implEncodeISOArray", char[].class, int.class, byte[].class, int.class, int.class) {
2661+
r.register(new InvocationPlugin("encodeISOArray0", char[].class, int.class, byte[].class, int.class, int.class) {
26692662
@Override
26702663
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode sa, ValueNode sp,
26712664
ValueNode da, ValueNode dp, ValueNode len) {

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allocation.inline.hpp")
7272
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allStatic.hpp")
7373
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+5/src/hotspot/share/nmt/memTag.hpp")
74-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+6/src/hotspot/share/runtime/os.cpp")
74+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+12/src/hotspot/share/runtime/os.cpp")
7575
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/runtime/os.hpp")
7676
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/runtime/os.inline.hpp")
7777
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/checkedCast.hpp")
@@ -86,7 +86,7 @@
8686
// The following annotations are for files in `src/svm`, which are completely customized for SVM
8787
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/logging/log.hpp")
8888
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allocation.cpp")
89-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/runtime/globals.hpp")
89+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+12/src/hotspot/share/runtime/globals.hpp")
9090
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/debug.cpp")
9191
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/debug.hpp")
9292
public class ContainerLibrary {

0 commit comments

Comments
 (0)