Skip to content

Commit c56e44b

Browse files
[GR-65949] Update labsjdk to 26+2-jvmci-b01
PullRequest: graal/21113
2 parents c8ea2a4 + 9fd5986 commit c56e44b

File tree

16 files changed

+104
-168
lines changed

16 files changed

+104
-168
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": "25", "build_id": "jdk-25+26-3319", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+2-83", "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 },
@@ -45,13 +45,13 @@
4545

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

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+1", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+1-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+1-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+1-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+1-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+1-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+1-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+2", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"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
@@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
5555
*/
5656
private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
5757
"26", Map.of(
58-
"Oracle Corporation", createLabsJDKVersion("26+1", 1),
59-
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+1", 1)));
58+
"Oracle Corporation", createLabsJDKVersion("26+2", 1),
59+
DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+2", 1)));
6060
private static final int NA = 0;
6161
/**
6262
* Minimum Java release supported by Graal.

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public final UnsignedWord getMinimumHeapSize() {
338338
@Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
339339
protected abstract long gcCount();
340340

341-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/gc/shared/genArguments.cpp#L195-L310")
341+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/share/gc/shared/genArguments.cpp#L190-L305")
342342
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/gc/parallel/psYoungGen.cpp#L146-L168")
343343
protected SizeParameters computeSizeParameters(SizeParameters existing) {
344344
UnsignedWord minYoungSpaces = minSpaceSize(); // eden

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxThreadCpuTimeSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public long getThreadCpuTime(IsolateThread isolateThread, boolean includeSystemT
6666
return fastCpuTime(pthread);
6767
}
6868

69-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+10/src/hotspot/os/linux/os_linux.cpp#L5113-L5125")
69+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/linux/os_linux.cpp#L4939-L4951")
7070
@Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
7171
private static long fastCpuTime(pthread_t pthread) {
7272
CIntPointer threadsClockId = StackValue.get(Integer.BYTES);

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ protected void park(boolean isAbsolute, long time) {
354354
}
355355
}
356356

357-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+10/src/hotspot/os/posix/os_posix.cpp#L1662-L1738")
357+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/posix/os_posix.cpp#L1830-L1906")
358358
private void park0(boolean isAbsolute, long time) {
359359
int status = Pthread.pthread_mutex_trylock_no_transition(mutex);
360360
if (status == Errno.EBUSY()) {
@@ -393,7 +393,7 @@ private void park0(boolean isAbsolute, long time) {
393393
}
394394

395395
@Override
396-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+10/src/hotspot/os/posix/os_posix.cpp#L1740-L1763")
396+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/posix/os_posix.cpp#L1908-L1931")
397397
protected void unpark() {
398398
StackOverflowCheck.singleton().makeYellowZoneAvailable();
399399
try {

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
@@ -60,11 +60,11 @@
6060
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
6161
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.cpp")
6262
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.hpp")
63-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+26/src/hotspot/os/linux/os_linux.cpp")
63+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/linux/os_linux.cpp")
6464
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.hpp")
6565
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.inline.hpp")
6666
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/include/jvm_md.h")
67-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/os/posix/os_posix.cpp")
67+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/posix/os_posix.cpp")
6868
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/os/posix/os_posix.hpp")
6969
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/os_posix.inline.hpp")
7070
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+26/src/hotspot/share/memory/allocation.hpp")

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,6 @@ private Class<?> defineClass0(String name, byte[] b, int off, int len, ClassLoad
198198

199199
@TargetClass(jdk.internal.access.SharedSecrets.class)
200200
final class Target_jdk_internal_access_SharedSecrets {
201-
@Substitute
202-
private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
203-
return null;
204-
}
205-
206201
/**
207202
* The JavaIOAccess implementation installed by the class initializer of java.io.Console
208203
* captures state like "is a tty". The only way to remove such state is by resetting the field.
@@ -215,10 +210,6 @@ private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
215210
final class Target_jdk_internal_access_JavaIOAccess {
216211
}
217212

218-
@TargetClass(jdk.internal.access.JavaAWTAccess.class)
219-
final class Target_jdk_internal_access_JavaAWTAccess {
220-
}
221-
222213
@TargetClass(className = "sun.reflect.misc.MethodUtil")
223214
final class Target_sun_reflect_misc_MethodUtil {
224215
@Substitute

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 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
@@ -52,7 +52,6 @@
5252

5353
import jdk.graal.compiler.debug.GraalError;
5454
import sun.util.resources.OpenListResourceBundle;
55-
import sun.util.resources.ParallelListResourceBundle;
5655

5756
public class BundleContentSubstitutedLocalizationSupport extends LocalizationSupport {
5857

@@ -135,7 +134,7 @@ private static boolean isBundleSupported(ResourceBundle bundle) {
135134

136135
@Platforms(Platform.HOSTED_ONLY.class)
137136
private static boolean isBundleSupported(Class<?> bundleClass) {
138-
return ListResourceBundle.class.isAssignableFrom(bundleClass) || OpenListResourceBundle.class.isAssignableFrom(bundleClass) || ParallelListResourceBundle.class.isAssignableFrom(bundleClass);
137+
return ListResourceBundle.class.isAssignableFrom(bundleClass) || OpenListResourceBundle.class.isAssignableFrom(bundleClass);
139138
}
140139

141140
@Platforms(Platform.HOSTED_ONLY.class)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/compression/utils/BundleSerializationUtils.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 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
@@ -29,6 +29,7 @@
2929
import java.util.List;
3030
import java.util.Map;
3131
import java.util.ResourceBundle;
32+
import java.util.function.Supplier;
3233

3334
import org.graalvm.nativeimage.Platform;
3435
import org.graalvm.nativeimage.Platforms;
@@ -53,7 +54,11 @@ public static Map<String, Object> extractContent(ResourceBundle bundle) {
5354
Class<?> clazz = bundle.getClass().getSuperclass();
5455
while (clazz != null && ResourceBundle.class.isAssignableFrom(clazz)) {
5556
try {
56-
return (Map<String, Object>) ReflectionUtil.lookupField(clazz, "lookup").get(bundle);
57+
Object lookup = ReflectionUtil.lookupField(clazz, "lookup").get(bundle);
58+
if (lookup instanceof Supplier) {
59+
return ((Supplier<Map<String, Object>>) lookup).get();
60+
}
61+
return (Map<String, Object>) lookup;
5762
} catch (ReflectionUtil.ReflectionUtilError | ReflectiveOperationException e) {
5863
clazz = clazz.getSuperclass();
5964
}

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_sun_util_resources_OpenListResourceBundle_SubstituteLoadLookup.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 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
@@ -38,20 +38,13 @@
3838
@SuppressWarnings({"static-method"})
3939
final class Target_sun_util_resources_OpenListResourceBundle_SubstituteLoadLookup {
4040

41-
@Alias private volatile Map<String, Object> lookup;
42-
4341
@Substitute
44-
private void loadLookup() {
45-
LocalizationSupport support = ImageSingletons.lookup(LocalizationSupport.class);
46-
Map<String, Object> content = support.getBundleContentOf(this);
47-
// use the supplied map implementation specified by the factory method
48-
Map<String, Object> tmp = createMap(content.size());
49-
tmp.putAll(content);
50-
synchronized (this) {
51-
if (lookup == null) {
52-
lookup = content;
53-
}
54-
}
42+
private Map<String, Object> lookup0() {
43+
Map<String, Object> preloadedContent = ImageSingletons.lookup(LocalizationSupport.class).getBundleContentOf(this);
44+
/* Use the type of map provided by the subclass. */
45+
Map<String, Object> map = createMap(preloadedContent.size());
46+
map.putAll(preloadedContent);
47+
return map;
5548
}
5649

5750
@Alias

0 commit comments

Comments
 (0)