Remove support for outdated JDK versions between 11 and 17

Author: Christian Wimmer

substratevm/mx.substratevm/suite.py

@@ -230,58 +230,13 @@
             "workingSets": "SVM",
         },
 
-        "com.oracle.svm.core.jdk14": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core"],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "jdk.internal.access.foreign",
-                ],
-            },
-            "javaCompliance": "14+",
-            "checkstyle": "com.oracle.svm.core",
-            "workingSets": "SVM",
-        },
-
-        "com.oracle.svm.core.jdk15": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core.jdk11"],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "jdk.internal.loader",
-                    "jdk.internal.misc",
-                    "sun.invoke.util",
-                ],
-            },
-            "javaCompliance": "15+",
-            "checkstyle": "com.oracle.svm.core",
-            "workingSets": "SVM",
-        },
-
-        "com.oracle.svm.core.jdk16": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core"],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "jdk.internal.loader",
-                    "jdk.internal.misc",
-                    "sun.invoke.util",
-                ],
-            },
-            "javaCompliance": "16+",
-            "checkstyle": "com.oracle.svm.core",
-            "workingSets": "SVM",
-        },
-
         "com.oracle.svm.core.jdk17": {
             "subDir": "src",
             "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core"],
+            "dependencies": ["com.oracle.svm.core.jdk11"],
             "requiresConcealed" : {
                 "java.base" : [
+                    "jdk.internal.access.foreign",
                     "jdk.internal.loader",
                     "jdk.internal.misc",
                     "jdk.internal.platform",
@@ -455,7 +410,7 @@
             ],
             "workingSets": "SVM",
         },
-        "com.oracle.svm.hosted.jdk14": {
+        "com.oracle.svm.hosted.jdk17": {
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
@@ -467,7 +422,7 @@
                 "jdk.internal.vm.ci" :
                     ["jdk.vm.ci.meta"],
             },
-            "javaCompliance": "14+",
+            "javaCompliance": "17+",
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
             ],
@@ -1079,13 +1034,10 @@
                 "com.oracle.svm.hosted",
                 "com.oracle.svm.hosted.jdk8",
                 "com.oracle.svm.hosted.jdk11",
-                "com.oracle.svm.hosted.jdk14",
+                "com.oracle.svm.hosted.jdk17",
                 "com.oracle.svm.core",
                 "com.oracle.svm.core.jdk8",
                 "com.oracle.svm.core.jdk11",
-                "com.oracle.svm.core.jdk14",
-                "com.oracle.svm.core.jdk15",
-                "com.oracle.svm.core.jdk16",
                 "com.oracle.svm.core.jdk17",
                 "com.oracle.svm.core.graal.amd64",
                 "com.oracle.svm.core.graal.aarch64",

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java

@@ -40,9 +40,6 @@
 import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
 import static org.graalvm.compiler.debug.GraalError.unimplemented;
 
-// Checkstyle: allow reflection
-import java.lang.reflect.Field;
-// Checkstyle: disallow reflection
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -131,6 +128,7 @@
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMBasicBlockRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMTypeRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMValueRef;
+import com.oracle.svm.util.ReflectionUtil;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
@@ -2015,25 +2013,22 @@ public void emitCacheWritebackSync(boolean isPreSync) {
 
     /**
      * Gets the value of {@code jdk.internal.misc.UnsafeConstants.DATA_CACHE_LINE_FLUSH_SIZE} which
-     * was introduced in JDK 14 by JEP 352.
+     * was introduced after JDK 11 by JEP 352.
      *
-     * This method uses reflection to be compatible with JDKs prior to 14.
+     * This method uses reflection to be compatible with JDK 11 and earlier.
      */
     private static int initDataCacheLineFlushSize() {
-        if (JavaVersionUtil.JAVA_SPEC >= 14) {
-            Class<?> c;
-            try {
-                // Checkstyle: stop
-                c = Class.forName("jdk.internal.misc.UnsafeConstants");
-                // Checkstyle: resume
-                Field f = c.getDeclaredField("DATA_CACHE_LINE_FLUSH_SIZE");
-                f.setAccessible(true);
-                return (int) f.get(null);
-            } catch (Exception e) {
-                throw new GraalError(e, "Expected UnsafeConstants.DATA_CACHE_LINE_FLUSH_SIZE to exist and be readable");
-            }
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
+            return 0;
+        }
+        try {
+            // Checkstyle: stop
+            Class<?> c = Class.forName("jdk.internal.misc.UnsafeConstants");
+            // Checkstyle: resume
+            return ReflectionUtil.readStaticField(c, "DATA_CACHE_LINE_FLUSH_SIZE");
+        } catch (ClassNotFoundException e) {
+            throw new GraalError(e, "Expected UnsafeConstants.DATA_CACHE_LINE_FLUSH_SIZE to exist and be readable");
         }
-        return 0;
     }
 
     private static int getDataCacheLineFlushSize() {

substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_Module_JDK11OrLater.java

@@ -24,21 +24,21 @@
  */
 package com.oracle.svm.core.jdk11;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Objects;
+
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
+import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK11To14;
 import com.oracle.svm.core.jdk.Resources;
 import com.oracle.svm.core.jdk.resources.ResourceStorageEntry;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Objects;
-
 @SuppressWarnings("unused")
 @TargetClass(value = java.lang.Module.class, onlyWith = JDK11OrLater.class)
 public final class Target_java_lang_Module_JDK11OrLater {
@@ -58,7 +58,7 @@ public InputStream getResourceAsStream(String name) {
     }
 
     @Substitute //
-    @TargetElement(onlyWith = JDK11To14.class)
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
     private static void defineModule0(Module module, boolean isOpen, String version, String location, String[] pns) {
         ModuleUtil.defineModule(module, isOpen, Arrays.asList(pns));
     }

substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/HiddenClassSupportImpl.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk16;
+package com.oracle.svm.core.jdk17;
 
 // Checkstyle: allow reflection
 
@@ -39,7 +39,7 @@
 import com.oracle.svm.core.jdk.RecordSupport;
 import com.oracle.svm.core.util.VMError;
 
-final class RecordSupportJDK16OrLater extends RecordSupport {
+final class RecordSupportJDK17OrLater extends RecordSupport {
     @Override
     public boolean isRecord(Class<?> clazz) {
         return clazz.isRecord();
@@ -73,14 +73,14 @@ public Constructor<?> getCanonicalRecordConstructor(Class<?> clazz) {
 }
 
 @AutomaticFeature
-final class RecordFeatureJDK16OrLater implements Feature {
+final class RecordFeatureJDK17OrLater implements Feature {
     @Override
     public boolean isInConfiguration(IsInConfigurationAccess access) {
-        return JavaVersionUtil.JAVA_SPEC >= 16;
+        return JavaVersionUtil.JAVA_SPEC >= 17;
     }
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(RecordSupport.class, new RecordSupportJDK16OrLater());
+        ImageSingletons.add(RecordSupport.class, new RecordSupportJDK17OrLater());
     }
 }

substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/JDKClassLoadingDeadlockWorkaround.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk15;
+package com.oracle.svm.core.jdk17;
 
 import java.io.File;
 import java.util.Deque;
@@ -32,15 +32,15 @@
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.jdk.JDK15OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.NativeLibrarySupport;
 
 import jdk.internal.loader.NativeLibraries;
 import jdk.internal.loader.NativeLibrary;
 
-@TargetClass(value = ClassLoader.class, onlyWith = JDK15OrLater.class)
+@TargetClass(value = ClassLoader.class, onlyWith = JDK17OrLater.class)
 @SuppressWarnings({"static-method", "unused"})
-final class Target_java_lang_ClassLoader_JDK15OrLater {
+final class Target_java_lang_ClassLoader_JDK17OrLater {
 
     @Substitute
     static NativeLibrary loadLibrary(Class<?> fromClass, String name) {
@@ -57,8 +57,8 @@ static NativeLibrary loadLibrary(Class<?> fromClass, File file) {
     }
 }
 
-@TargetClass(value = jdk.internal.loader.NativeLibraries.class, onlyWith = JDK15OrLater.class)
-final class Target_jdk_internal_loader_NativeLibraries_JDK15OrLater {
+@TargetClass(value = jdk.internal.loader.NativeLibraries.class, onlyWith = JDK17OrLater.class)
+final class Target_jdk_internal_loader_NativeLibraries_JDK17OrLater {
 
     /**
      * The NativeLibraries is only used by the `loadLibrary` methods that are substituted, so we do
@@ -88,7 +88,7 @@ public static NativeLibraries jniNativeLibraries(ClassLoader loader) {
      */
 
     @Delete
-    private static native boolean load(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK15OrLater impl, String name, boolean isBuiltin, boolean isJNI);
+    private static native boolean load(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK17OrLater impl, String name, boolean isBuiltin, boolean isJNI);
 
     @Delete
     private static native void unload(String name, boolean isBuiltin, boolean isJNI, long handle);
@@ -97,9 +97,9 @@ public static NativeLibraries jniNativeLibraries(ClassLoader loader) {
     private static native String findBuiltinLib(String name);
 
     @Delete
-    private static native long findEntry0(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK15OrLater lib, String name);
+    private static native long findEntry0(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK17OrLater lib, String name);
 }
 
-@TargetClass(value = jdk.internal.loader.NativeLibraries.class, innerClass = "NativeLibraryImpl", onlyWith = JDK15OrLater.class)
-final class Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK15OrLater {
+@TargetClass(value = jdk.internal.loader.NativeLibraries.class, innerClass = "NativeLibraryImpl", onlyWith = JDK17OrLater.class)
+final class Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK17OrLater {
 }