Skip to content

Commit 0008303

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
[GR-68735] Update labsjdk to 26+11-jvmci-b01
PullRequest: graal/21866
2 parents 2385a96 + f2f9ef1 commit 0008303

File tree

8 files changed

+53
-18
lines changed

8 files changed

+53
-18
lines changed

‎common.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+10-1012", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+11-1117", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -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+10", "platformspecific": true, "extrabundles": ["static-libs"]},
58-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+10-jvmci-b01", "platformspecific": true },
59-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+10-jvmci-b01-debug", "platformspecific": true },
60-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+10-jvmci-b01-sulong", "platformspecific": true },
61-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+10-jvmci-b01", "platformspecific": true },
62-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+10-jvmci-b01-debug", "platformspecific": true },
63-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+10-jvmci-b01-sulong", "platformspecific": true }
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 }
6464
},
6565

6666
"eclipse": {

‎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+10", 1),
61-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+10", 1)));
60+
"Oracle Corporation", createLabsJDKVersion("26+11", 1),
61+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+11", 1)));
6262
// Checkstyle: resume stable iteration order check
6363

6464
private static final int NA = 0;

‎espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/standard/Target_sun_misc_Unsafe.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,32 @@ public static long objectFieldOffset1(@JavaType(Unsafe.class) StaticObject self,
913913
throw meta.throwException(meta.java_lang_InternalError);
914914
}
915915

916+
@Substitution(hasReceiver = true, nameProvider = Unsafe11.class)
917+
static long knownObjectFieldOffset0(@SuppressWarnings("unused") StaticObject self, @JavaType(Class.class) StaticObject c, @JavaType(String.class) StaticObject guestName,
918+
@Inject Meta meta, @Inject EspressoLanguage language) {
919+
// Error code -1 is not found, -2 is static field
920+
Klass k = c.getMirrorKlass(meta);
921+
if (!(k instanceof ObjectKlass kl)) {
922+
return -1;
923+
}
924+
String hostName = meta.toHostString(guestName);
925+
Symbol<Name> name = meta.getNames().lookup(hostName);
926+
if (name == null) {
927+
return -1;
928+
}
929+
for (Field f : kl.getFieldTable()) {
930+
if (!f.isRemoved() && f.getName() == name) {
931+
return getGuestFieldOffset(f, language);
932+
}
933+
}
934+
for (Field f : kl.getStaticFieldTable()) {
935+
if (!f.isRemoved() && f.getName() == name) {
936+
return -2;
937+
}
938+
}
939+
return -1;
940+
}
941+
916942
// region UnsafeAccessors
917943

918944
@GenerateInline

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
6161
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/linux/osContainer_linux.cpp")
6262
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/linux/osContainer_linux.hpp")
63-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+8/src/hotspot/os/linux/os_linux.cpp")
63+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+11/src/hotspot/os/linux/os_linux.cpp")
6464
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/linux/os_linux.hpp")
6565
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/linux/os_linux.inline.hpp")
6666
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/posix/include/jvm_md.h")
@@ -78,10 +78,10 @@
7878
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
7979
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/compilerWarnings.hpp")
8080
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/globalDefinitions_gcc.hpp")
81-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/utilities/globalDefinitions.hpp")
81+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+11/src/hotspot/share/utilities/globalDefinitions.hpp")
8282
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/macros.hpp")
8383
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/ostream.cpp")
84-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/ostream.hpp")
84+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+11/src/hotspot/share/utilities/ostream.hpp")
8585
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/permitForbiddenFunctions.hpp")
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")

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_nio_BufferCleaner.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public final class Target_java_nio_BufferCleaner {
4343
static ReferenceQueue<Object> queue;
4444
@Alias //
4545
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
46-
static Target_java_nio_BufferCleaner_CleaningThread cleaningThread;
46+
static Thread cleaningThread;
4747
}
4848

49-
@TargetClass(className = "java.nio.BufferCleaner", innerClass = "CleaningThread")
50-
final class Target_java_nio_BufferCleaner_CleaningThread {
49+
@TargetClass(className = "java.nio.BufferCleaner", innerClass = "CleaningRunnable")
50+
final class Target_java_nio_BufferCleaner_CleaningRunnable {
5151
@SuppressWarnings("static-method")
5252
@Substitute
5353
public void run() {

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ final class Target_java_util_concurrent_atomic_AtomicReferenceFieldUpdater_Atomi
104104
if (!Modifier.isVolatile(modifiers))
105105
throw new IllegalArgumentException("Must be volatile type");
106106

107+
if (Modifier.isStatic(modifiers))
108+
throw new IllegalArgumentException("Must not be a static field");
109+
107110
// access checks are disabled
108111
this.cclass = tclass;
109112
this.tclass = tclass;
@@ -142,6 +145,9 @@ final class Target_java_util_concurrent_atomic_AtomicIntegerFieldUpdater_AtomicI
142145
if (!Modifier.isVolatile(modifiers))
143146
throw new IllegalArgumentException("Must be volatile type");
144147

148+
if (Modifier.isStatic(modifiers))
149+
throw new IllegalArgumentException("Must not be a static field");
150+
145151
// access checks are disabled
146152
this.cclass = tclass;
147153
this.tclass = tclass;
@@ -179,6 +185,9 @@ final class Target_java_util_concurrent_atomic_AtomicLongFieldUpdater_CASUpdater
179185
if (!Modifier.isVolatile(modifiers))
180186
throw new IllegalArgumentException("Must be volatile type");
181187

188+
if (Modifier.isStatic(modifiers))
189+
throw new IllegalArgumentException("Must not be a static field");
190+
182191
// access checks are disabled
183192
this.cclass = tclass;
184193
this.tclass = tclass;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public Object getUncompressedObject(long address) {
166166
private native long objectFieldOffset0(Field f);
167167

168168
@Delete
169-
private native long objectFieldOffset1(Class<?> c, String name);
169+
private native long knownObjectFieldOffset0(Class<?> c, String name);
170170

171171
@Delete
172172
private native long staticFieldOffset0(Field f);

‎substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ private Set<String> getBuiltInModules() {
19031903
Path jdkRoot = config.rootDir;
19041904
try {
19051905
var reader = ImageReader.open(jdkRoot.resolve("lib/modules"));
1906-
return new LinkedHashSet<>(List.of(reader.getModuleNames()));
1906+
return new LinkedHashSet<>(reader.findNode("/modules").getChildNames().map(s -> s.substring("/modules/".length())).toList());
19071907
} catch (IOException e) {
19081908
throw showError("Unable to determine builtin modules of JDK in " + jdkRoot, e);
19091909
}

0 commit comments

Comments
 (0)