diff --git a/common.json b/common.json index 9ee25b270827..c3f5377b4b67 100644 --- a/common.json +++ b/common.json @@ -8,7 +8,7 @@ "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { - "galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+17-1898", "platformspecific": true, "extrabundles": ["static-libs"]}, + "galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+18-2095", "platformspecific": true, "extrabundles": ["static-libs"]}, "oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]}, "labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true }, diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java index 98b4ed23ece4..616c4d274c0b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java @@ -100,11 +100,6 @@ public final class Target_java_lang_VirtualThread { @TargetElement(onlyWith = JDK21OrEarlier.class) // private static ScheduledExecutorService UNPARKER; - @Alias // - @InjectAccessors(DelayedTaskSchedulersAccessor.class) // - @TargetElement(onlyWith = JDKLatest.class) // - private static ScheduledExecutorService[] DELAYED_TASK_SCHEDULERS; - /** Go through {@link #nondefaultScheduler}. */ @Alias // @InjectAccessors(SchedulerAccessor.class) // @@ -134,10 +129,6 @@ public final class Target_java_lang_VirtualThread { @TargetElement(onlyWith = JDK21OrEarlier.class) private static native ScheduledExecutorService createDelayedTaskScheduler(); - @Alias - @TargetElement(onlyWith = JDKLatest.class) - private static native ScheduledExecutorService[] createDelayedTaskSchedulers(); - @SuppressWarnings("unused") private static final class AlwaysFalseAccessor { static boolean get(Target_java_lang_VirtualThread vt) { @@ -192,28 +183,6 @@ private static synchronized ScheduledExecutorService initializeDelayedTaskSchedu } } - private static final class DelayedTaskSchedulersAccessor { - private static volatile ScheduledExecutorService[] delayedTaskSchedulers; - - @SuppressWarnings("unused") - public static ScheduledExecutorService[] get() { - ScheduledExecutorService[] result = delayedTaskSchedulers; - if (result == null) { - result = initializeDelayedTaskScheduler(); - } - return result; - } - - private static synchronized ScheduledExecutorService[] initializeDelayedTaskScheduler() { - ScheduledExecutorService[] result = delayedTaskSchedulers; - if (result == null) { - result = createDelayedTaskSchedulers(); - delayedTaskSchedulers = result; - } - return result; - } - } - @SuppressWarnings("unused") private static final class SchedulerAccessor { static Executor get(Target_java_lang_VirtualThread self) {