[GR-45327] Remove JDK 11 support from native image code.

PullRequest: graal/14266

Author: Christian Wimmer

common.json

@@ -10,7 +10,7 @@
   "jdks": {
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
 
-    "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.1",  "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
+    "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.6",  "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.0-b10", "platformspecific": true },
     "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.0-b10-debug", "platformspecific": true },
     "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.0-b10-sulong", "platformspecific": true },

substratevm/mx.substratevm/suite.py

@@ -270,6 +270,7 @@
                     "sun.util.calendar",
                     "sun.util.locale.provider",
                     "sun.util.resources",
+                    "jdk.internal.access",
                     "jdk.internal.event",
                     "jdk.internal.loader",
                     "jdk.internal.logger",
@@ -428,6 +429,11 @@
                 "LLVM_PLATFORM_SPECIFIC_SHADOWED",
                 "JAVACPP_PLATFORM_SPECIFIC_SHADOWED",
             ],
+            "requiresConcealed" : {
+                "java.base" : [
+                    "jdk.internal.misc",
+                ],
+            },
             "checkstyle": "com.oracle.svm.core",
             "javaCompliance" : "17+",
             "annotationProcessors": [
@@ -595,6 +601,7 @@
             "requiresConcealed" : {
                 "java.base" : [
                     "jdk.internal",
+                    "jdk.internal.access",
                     "jdk.internal.event",
                     "jdk.internal.loader",
                     "jdk.internal.misc",

substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/PointsToAnalyzer.java

@@ -45,7 +45,6 @@
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.util.Providers;
 import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.word.WordTypes;
 import org.graalvm.nativeimage.hosted.Feature;
 
@@ -93,11 +92,9 @@ public final class PointsToAnalyzer {
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "jdk.internal.misc");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.text.spi");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "jdk.internal.org.objectweb.asm");
-        if (JavaVersionUtil.JAVA_SPEC >= 16) {
-            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.reflect.annotation");
-            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.security.jca");
-            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.jdeps", "com.sun.tools.classfile");
-        }
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.reflect.annotation");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.security.jca");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.jdeps", "com.sun.tools.classfile");
     }
 
     private final StandalonePointsToAnalysis bigbang;

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

@@ -63,7 +63,6 @@
 import org.graalvm.compiler.core.common.type.RawPointerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.lir.LIRFrameState;
 import org.graalvm.compiler.lir.LIRInstruction;
@@ -82,7 +81,6 @@
 import org.graalvm.compiler.nodes.cfg.HIRBlock;
 import org.graalvm.compiler.nodes.type.NarrowOopStamp;
 import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.c.constant.CEnum;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
@@ -128,8 +126,8 @@
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMTypeRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMValueRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.global.LLVM;
-import com.oracle.svm.util.ReflectionUtil;
 
+import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.DebugInfo;
@@ -1812,7 +1810,7 @@ public enum DebugLevel {
 
     @Override
     public void emitCacheWriteback(Value address) {
-        int cacheLineSize = getDataCacheLineFlushSize();
+        int cacheLineSize = Unsafe.getUnsafe().dataCacheLineFlushSize();
         if (cacheLineSize == 0) {
             throw shouldNotReachHere("cache writeback with cache line size of 0"); // ExcludeFromJacocoGeneratedReport
         }
@@ -1825,28 +1823,4 @@ public void emitCacheWriteback(Value address) {
     public void emitCacheWritebackSync(boolean isPreSync) {
         throw unimplemented("cache sync barrier (GR-30894)"); // ExcludeFromJacocoGeneratedReport
     }
-
-    private static final int dataCacheLineFlushSize = initDataCacheLineFlushSize();
-
-    /**
-     * Gets the value of {@code jdk.internal.misc.UnsafeConstants.DATA_CACHE_LINE_FLUSH_SIZE} which
-     * was introduced after JDK 11 by JEP 352.
-     *
-     * This method uses reflection to be compatible with JDK 11 and earlier.
-     */
-    private static int initDataCacheLineFlushSize() {
-        if (JavaVersionUtil.JAVA_SPEC <= 11) {
-            return 0;
-        }
-        try {
-            Class<?> c = Class.forName("jdk.internal.misc.UnsafeConstants");
-            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");
-        }
-    }
-
-    private static int getDataCacheLineFlushSize() {
-        return dataCacheLineFlushSize;
-    }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -841,16 +841,7 @@ public ReportingSupport(Path reportingPath) {
     public static int getPageSize() {
         int value = PageSize.getValue();
         if (value == 0) {
-            try {
-                /*
-                 * On JDK 17 and later, this is just a final field access that can never fail. But
-                 * on JDK 11, it is a native method call with some corner cases that can throw an
-                 * exception.
-                 */
-                return Unsafe.getUnsafe().pageSize();
-            } catch (IllegalArgumentException e) {
-                return 4096;
-            }
+            return Unsafe.getUnsafe().pageSize();
         }
         assert value > 0;
         return value;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_PhantomReference.java

@@ -29,13 +29,10 @@
 import com.oracle.svm.core.SubstrateUtil;
 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.JDK17OrLater;
 
 @TargetClass(PhantomReference.class)
 public final class Target_java_lang_ref_PhantomReference<T> {
     @Substitute
-    @TargetElement(onlyWith = JDK17OrLater.class)
     boolean refersTo0(Object obj) {
         return ReferenceInternals.refersTo(SubstrateUtil.cast(this, PhantomReference.class), obj);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java

@@ -44,9 +44,6 @@
 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.JDK17OrLater;
-import com.oracle.svm.core.jdk.JDK17_0_2OrLater;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 
@@ -131,21 +128,17 @@ public void clear() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK17OrLater.class)
     private void clear0() {
         clear();
     }
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK17_0_2OrLater.class)
     native boolean refersToImpl(T obj);
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK17OrLater.class)
     public native boolean refersTo(T obj);
 
     @Substitute
-    @TargetElement(onlyWith = JDK17OrLater.class)
     boolean refersTo0(Object obj) {
         return ReferenceInternals.refersTo(SubstrateUtil.cast(this, Reference.class), obj);
     }
@@ -174,11 +167,9 @@ static void reachabilityFence(Object ref) {
     }
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK17OrLater.class) //
     native T getFromInactiveFinalReference();
 
     @Substitute //
-    @TargetElement(onlyWith = JDK17OrLater.class) //
     void clearInactiveFinalReference() {
         // assert this instanceof FinalReference;
         assert next != null; // I.e. FinalReference is inactive

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_jdk_internal_ref_Cleaner.java

@@ -50,17 +50,6 @@ public final class Target_jdk_internal_ref_Cleaner {
     native void clean();
 }
 
-/**
- * On JDK11+, the cleaner infrastructure is quite different from JDK8:
- * <ul>
- * <li>java.lang.ref.Cleaner: starts a new thread to process its reference queue.</li>
- * <li>jdk.internal.ref.CleanerFactory: provides a common cleaner with a shared cleaner thread. In
- * native-image, we do not necessarily spawn a separate thread for processing references, but may
- * drain the queue after garbage collection.</li>
- * <li>jdk.internal.ref.Cleaner: this only seems to be used by DirectByteBuffer but at least the
- * handling is the same as on JDK 8.
- * </ul>
- */
 @TargetClass(className = "jdk.internal.ref.CleanerFactory")
 final class Target_jdk_internal_ref_CleanerFactory {
     @Alias