[GR-34751] Remove code specific to JDK 8.

PullRequest: graal/10650

Author: Christian Wimmer

substratevm/mx.substratevm/suite.py

@@ -209,7 +209,7 @@
                     "jdk.internal.loader",
                     "sun.text.spi",
                     "jdk.internal.perf",
-                    "jdk.internal.loader"
+                    "jdk.internal.ref",
                 ],
                 "java.desktop": [
                     "sun.java2d",
@@ -424,6 +424,7 @@
                     "sun.util.resources",
                     "jdk.internal.module",
                     "sun.text.spi",
+                    "jdk.internal.reflect",
                 ],
                 "jdk.internal.vm.ci" : [
                     "jdk.vm.ci.runtime",
@@ -731,6 +732,7 @@
                     "sun.invoke.util",
                     "sun.reflect.annotation",
                     "sun.reflect.generics.repository",
+                    "jdk.internal.reflect",
                 ],
                 "jdk.internal.vm.ci" : [
                     "jdk.vm.ci.code",
@@ -754,6 +756,7 @@
             "requiresConcealed" : {
                 "java.base" : [
                     "sun.invoke.util",
+                    "jdk.internal.reflect",
                 ],
             },
             "checkstyle": "com.oracle.svm.core",

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java

@@ -75,7 +75,6 @@
 import com.oracle.svm.agent.tracing.core.Tracer;
 import com.oracle.svm.configure.trace.AccessAdvisor;
 import com.oracle.svm.core.c.function.CEntryPointOptions;
-import com.oracle.svm.core.jdk.Package_jdk_internal_reflect;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.jni.JNIObjectHandles;
 import com.oracle.svm.jni.nativeapi.JNIEnvironment;
@@ -1495,7 +1494,7 @@ private interface BreakpointHandler {
                                     "(Ljava/lang/ClassLoader;[Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;", BreakpointInterceptor::newProxyInstance),
 
                     brk("java/io/ObjectStreamClass", "<init>", "(Ljava/lang/Class;)V", BreakpointInterceptor::objectStreamClassConstructor),
-                    brk(Package_jdk_internal_reflect.getQualifiedName().replace(".", "/") + "/ReflectionFactory",
+                    brk("jdk/internal/reflect/ReflectionFactory",
                                     "newConstructorForSerialization",
                                     "(Ljava/lang/Class;Ljava/lang/reflect/Constructor;)Ljava/lang/reflect/Constructor;", BreakpointInterceptor::customTargetConstructorSerialization),
                     optionalBrk("java/util/ResourceBundle",

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMGraphBuilderPlugins.java

@@ -24,6 +24,9 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
+// Checkstyle: stop
+
+import java.lang.reflect.Type;
 import java.util.Arrays;
 
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -42,16 +45,13 @@
 import org.graalvm.compiler.replacements.nodes.FusedMultiplyAddNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 import com.oracle.svm.core.graal.llvm.replacements.LLVMIntrinsicNode.LLVMIntrinsicOperation;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-// Checkstyle: stop
-import java.lang.reflect.Type;
 // Checkstyle: resume
 
 public class LLVMGraphBuilderPlugins implements TargetGraphBuilderPlugins {
@@ -100,9 +100,7 @@ private static void registerMathPlugins(InvocationPlugins plugins, Replacements
             registerBinaryLLVMIntrinsic(r, "copySign", LLVMIntrinsicOperation.COPYSIGN, kind, kind.toJavaClass(), kind.toJavaClass());
         }
 
-        if (JavaVersionUtil.JAVA_SPEC > 8) {
-            registerFMA(r);
-        }
+        registerFMA(r);
     }
 
     private static void registerUnaryMath(Registration r, String name, UnaryOperation operation) {

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixNativeLibraryFeature.java

@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core.posix;
 
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -59,9 +58,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
 
     @Override
     public void duringSetup(DuringSetupAccess access) {
-        if (JavaVersionUtil.JAVA_SPEC >= 11) {
-            NativeLibrarySupport.singleton().preregisterUninitializedBuiltinLibrary("extnet");
-        }
+        NativeLibrarySupport.singleton().preregisterUninitializedBuiltinLibrary("extnet");
     }
 }
 
@@ -98,7 +95,6 @@ public boolean initializeBuiltinLibraries() {
         if (Platform.includedIn(InternalPlatform.PLATFORM_JNI.class)) {
             try {
                 loadJavaLibrary();
-                loadZipLibrary();
                 loadNetLibrary();
                 /*
                  * The JDK uses posix_spawn on the Mac to launch executables. This requires a

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixUtils.java

@@ -26,12 +26,9 @@
 
 import java.io.FileDescriptor;
 import java.io.IOException;
-import java.util.function.Function;
 
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CIntPointer;
@@ -151,25 +148,13 @@ public static int getpid() {
         return Unistd.getpid();
     }
 
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private static final class ProcessNameProvider implements Function<TargetClass, String> {
-        @Override
-        public String apply(TargetClass annotation) {
-            if (JavaVersionUtil.JAVA_SPEC <= 8) {
-                return "java.lang.UNIXProcess";
-            } else {
-                return "java.lang.ProcessImpl";
-            }
-        }
-    }
-
-    @TargetClass(classNameProvider = ProcessNameProvider.class)
-    private static final class Target_java_lang_UNIXProcess {
+    @TargetClass(className = "java.lang.ProcessImpl")
+    private static final class Target_java_lang_ProcessImpl {
         @Alias int pid;
     }
 
     public static int getpid(Process process) {
-        Target_java_lang_UNIXProcess instance = SubstrateUtil.cast(process, Target_java_lang_UNIXProcess.class);
+        Target_java_lang_ProcessImpl instance = SubstrateUtil.cast(process, Target_java_lang_ProcessImpl.class);
         return instance.pid;
     }
 

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

@@ -27,11 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Function;
 
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.type.CIntPointer;
 import org.graalvm.nativeimage.hosted.Feature;
@@ -53,19 +49,7 @@
 import com.oracle.svm.core.posix.headers.Time;
 import com.oracle.svm.core.util.VMError;
 
-@Platforms(Platform.HOSTED_ONLY.class)
-class Package_jdk_internal_misc implements Function<TargetClass, String> {
-    @Override
-    public String apply(TargetClass annotation) {
-        if (JavaVersionUtil.JAVA_SPEC <= 8) {
-            return "sun.misc." + annotation.className();
-        } else {
-            return "jdk.internal.misc." + annotation.className();
-        }
-    }
-}
-
-@TargetClass(classNameProvider = Package_jdk_internal_misc.class, className = "Signal")
+@TargetClass(className = "jdk.internal.misc.Signal")
 final class Target_jdk_internal_misc_Signal {
 
     @Substitute

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java

@@ -30,7 +30,6 @@
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.c.libc.LibCBase;
 import com.oracle.svm.core.util.UserError;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 public class MuslLibC implements LibCBase {
 
@@ -67,8 +66,5 @@ public void checkIfLibCSupported() {
         if (!SubstrateOptions.StaticExecutable.getValue()) {
             throw UserError.abort("Musl can only be used for statically linked executables.");
         }
-        if (JavaVersionUtil.JAVA_SPEC < 11) {
-            throw UserError.abort("Musl can only be used with labsjdk 11+.");
-        }
     }
 }

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/Target_jdk_internal_misc_Signal.java

@@ -38,14 +38,13 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.Jvm;
-import com.oracle.svm.core.jdk.Package_jdk_internal_misc;
 import com.oracle.svm.core.jdk.PlatformNativeLibrarySupport;
 import com.oracle.svm.core.jdk.RuntimeSupport;
 import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.core.windows.headers.WinBase;
 
-@TargetClass(classNameProvider = Package_jdk_internal_misc.class, className = "Signal")
+@TargetClass(className = "jdk.internal.misc.Signal")
 final class Target_jdk_internal_misc_Signal {
     // Checkstyle: stop
     @Alias @RecomputeFieldValue(kind = FromAlias)//

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsNativeLibraryFeature.java

@@ -68,7 +68,6 @@ static void initialize() {
     public boolean initializeBuiltinLibraries() {
         try {
             loadJavaLibrary();
-            loadZipLibrary();
             loadNetLibrary();
         } catch (UnsatisfiedLinkError e) {
             Log.log().string("System.loadLibrary failed, " + e).newline();

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

@@ -46,7 +46,6 @@
 import org.graalvm.compiler.options.OptionType;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
 
@@ -388,10 +387,8 @@ public static final long getTearDownFailureNanos() {
         @Override
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, String oldValue, String newValue) {
             if ("llvm".equals(newValue)) {
-                if (JavaVersionUtil.JAVA_SPEC >= 11) {
-                    /* See GR-14405, https://github.com/oracle/graal/issues/1056 */
-                    GraalOptions.EmitStringSubstitutions.update(values, false);
-                }
+                /* See GR-14405, https://github.com/oracle/graal/issues/1056 */
+                GraalOptions.EmitStringSubstitutions.update(values, false);
                 /*
                  * The code information is filled before linking, which means that stripping dead
                  * functions makes it incoherent with the executable.
@@ -575,10 +572,6 @@ public Boolean getValue(OptionValues values) {
     @Option(help = "For internal purposes only. Disables type id result verification even when running with assertions enabled.", stability = OptionStability.EXPERIMENTAL, type = Debug)//
     public static final HostedOptionKey<Boolean> DisableTypeIdResultVerification = new HostedOptionKey<>(true);
 
-    public static boolean areMethodHandlesSupported() {
-        return JavaVersionUtil.JAVA_SPEC >= 11;
-    }
-
     @Option(help = "Enables the signal API (sun.misc.Signal or jdk.internal.misc.Signal). Defaults to false for shared library and true for executables", stability = OptionStability.EXPERIMENTAL, type = Expert)//
     public static final HostedOptionKey<Boolean> EnableSignalAPI = new HostedOptionKey<>(null) {
         @Override