Skip to content

Commit 1c7eccb

Browse files
jerboaajerboaa
committed
Merge upstream graalvm-community-jdk21u into mandrel/23.1 (2025-08-06)
Usual merge from upstream. Includes the version bump from 23.1.8 to 23.1.9 and a fix to be able to build with JDK 21.0.9+1 (EA).
2 parents ddf19d5 + f951a5c commit 1c7eccb

File tree

11 files changed

+61
-19
lines changed

11 files changed

+61
-19
lines changed

‎compiler/mx.compiler/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"sourceinprojectwhitelist" : [],
55

66
"groupId" : "org.graalvm.compiler",
7-
"version" : "23.1.8.0",
8-
"release" : True,
7+
"version" : "23.1.9.0",
8+
"release" : False,
99
"url" : "http://www.graalvm.org/",
1010
"developer" : {
1111
"name" : "GraalVM Development",

‎espresso/mx.espresso/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
suite = {
2424
"mxversion": "6.44.0",
2525
"name": "espresso",
26-
"version" : "23.1.8.0",
27-
"release" : True,
26+
"version" : "23.1.9.0",
27+
"release" : False,
2828
"groupId" : "org.graalvm.espresso",
2929
"url" : "https://www.graalvm.org/reference-manual/java-on-truffle/",
3030
"developer" : {

‎regex/mx.regex/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343

4444
"name" : "regex",
4545

46-
"version" : "23.1.8.0",
47-
"release" : True,
46+
"version" : "23.1.9.0",
47+
"release" : False,
4848
"groupId" : "org.graalvm.regex",
4949
"url" : "http://www.graalvm.org/",
5050
"developer" : {

‎sdk/mx.sdk/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
suite = {
4242
"mxversion": "6.39.0",
4343
"name" : "sdk",
44-
"version" : "23.1.8.0",
45-
"release" : True,
44+
"version" : "23.1.9.0",
45+
"release" : False,
4646
"sourceinprojectwhitelist" : [],
4747
"url" : "https://github.com/oracle/graal",
4848
"groupId" : "org.graalvm.sdk",

‎substratevm/mx.substratevm/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
suite = {
33
"mxversion": "6.27.1",
44
"name": "substratevm",
5-
"version" : "23.1.8.0",
6-
"release" : True,
5+
"version" : "23.1.9.0",
6+
"release" : False,
77
"url" : "https://github.com/oracle/graal/tree/master/substratevm",
88

99
"groupId" : "org.graalvm.nativeimage",

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21u8OrEarlier.java‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright (c) 2025, 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
package com.oracle.svm.core.jdk;
26+
27+
import java.util.function.BooleanSupplier;
28+
29+
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
30+
31+
public class JDK21u8OrEarlier implements BooleanSupplier {
32+
33+
public static final boolean jdk21u8OrEarlier = JavaVersionUtil.JAVA_SPEC < 21 ||
34+
(JavaVersionUtil.JAVA_SPEC == 21 && Runtime.version().update() <= 8);
35+
36+
@Override
37+
public boolean getAsBoolean() {
38+
return jdk21u8OrEarlier;
39+
}
40+
}

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -53,6 +53,7 @@
5353
import com.oracle.svm.core.hub.DynamicHub;
5454
import com.oracle.svm.core.invoke.Target_java_lang_invoke_MemberName;
5555
import com.oracle.svm.core.jdk.JDK20OrEarlier;
56+
import com.oracle.svm.core.jdk.JDK21u8OrEarlier;
5657
import com.oracle.svm.core.reflect.target.Target_java_lang_reflect_Field;
5758
import com.oracle.svm.core.util.VMError;
5859
import com.oracle.svm.util.ReflectionUtil;
@@ -196,6 +197,7 @@ private static Object getMemberVMInfo(Target_java_lang_invoke_MemberName self) {
196197
private static native void copyOutBootstrapArguments(Class<?> caller, int[] indexInfo, int start, int end, Object[] buf, int pos, boolean resolve, Object ifNotAvailable);
197198

198199
@Substitute
200+
@TargetElement(onlyWith = JDK21u8OrEarlier.class)
199201
private static void clearCallSiteContext(Target_java_lang_invoke_MethodHandleNatives_CallSiteContext context) {
200202
throw unimplemented("CallSiteContext not supported");
201203
}
@@ -395,6 +397,6 @@ final class Target_java_lang_invoke_MethodHandleNatives_Constants {
395397
// Checkstyle: resume
396398
}
397399

398-
@TargetClass(className = "java.lang.invoke.MethodHandleNatives", innerClass = "CallSiteContext")
400+
@TargetClass(className = "java.lang.invoke.MethodHandleNatives", innerClass = "CallSiteContext", onlyWith = JDK21u8OrEarlier.class)
399401
final class Target_java_lang_invoke_MethodHandleNatives_CallSiteContext {
400402
}

‎tools/mx.tools/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"defaultLicense" : "GPLv2-CPE",
2727

2828
"groupId" : "org.graalvm.tools",
29-
"version" : "23.1.8.0",
30-
"release" : True,
29+
"version" : "23.1.9.0",
30+
"release" : False,
3131
"url" : "http://openjdk.java.net/projects/graal",
3232
"developer" : {
3333
"name" : "GraalVM Development",

‎truffle/mx.truffle/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
suite = {
4242
"mxversion": "6.39.0",
4343
"name" : "truffle",
44-
"version" : "23.1.8.0",
45-
"release" : True,
44+
"version" : "23.1.9.0",
45+
"release" : False,
4646
"groupId" : "org.graalvm.truffle",
4747
"sourceinprojectwhitelist" : [],
4848
"url" : "http://openjdk.java.net/projects/graal",

‎vm/mx.vm/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
suite = {
22
"name": "vm",
3-
"version" : "23.1.8.0",
3+
"version" : "23.1.9.0",
44
"mxversion": "6.41.0",
5-
"release" : True,
5+
"release" : False,
66
"groupId" : "org.graalvm",
77

88
"url" : "http://www.graalvm.org/",

0 commit comments

Comments
 (0)