Use JDK 11 classes directly instead via a Target class

Author: Christian Wimmer

substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_Module_JDK17OrLater.java

@@ -35,7 +35,7 @@
 import com.oracle.svm.core.jdk.ModuleUtil;
 
 @SuppressWarnings("unused")
-@TargetClass(value = Module.class, onlyWith = JDK17OrLater.class)
+@TargetClass(value = java.lang.Module.class, onlyWith = JDK17OrLater.class)
 public final class Target_java_lang_Module_JDK17OrLater {
 
     // Checkstyle: allow synchronization

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -70,14 +70,15 @@
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.Resources;
-import com.oracle.svm.core.jdk.Target_java_lang_Module;
-import com.oracle.svm.core.jdk.Target_jdk_internal_reflect_Reflection;
 import com.oracle.svm.core.meta.SharedType;
 import com.oracle.svm.core.util.LazyFinalReference;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 import com.oracle.svm.util.ReflectionUtil.ReflectionUtilError;
 
+import jdk.internal.reflect.ConstantPool;
+import jdk.internal.reflect.Reflection;
+import jdk.internal.reflect.ReflectionFactory;
 import jdk.vm.ci.meta.JavaKind;
 
 @Hybrid(canHybridFieldsBeDuplicated = false)
@@ -290,11 +291,9 @@ public final class DynamicHub implements JavaKind.FormatWithToString, AnnotatedE
     private AnnotatedSuperInfo annotatedSuperInfo;
 
     /**
-     * Field used for module information access at run-time The run time type of this field is
-     * java.lang.Module but can be casted to {@link Target_java_lang_Module} The module is of type
-     * Object to avoid ClassCastExceptions at image build time due to base module miss-match.
+     * Field used for module information access at run-time.
      */
-    private Object module;
+    private Module module;
 
     /**
      * JDK 11 and later: the class that serves as the host for the nest. All nestmates have the same
@@ -303,7 +302,7 @@ public final class DynamicHub implements JavaKind.FormatWithToString, AnnotatedE
     private final Class<?> nestHost;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    public void setModule(Object module) {
+    public void setModule(Module module) {
         this.module = module;
     }
 
@@ -682,7 +681,7 @@ public Enum<?>[] getEnumConstantsShared() {
 
     @Substitute
     public InputStream getResourceAsStream(String resourceName) {
-        String moduleName = module == null ? null : SubstrateUtil.cast(module, Target_java_lang_Module.class).name;
+        String moduleName = module == null ? null : module.getName();
         String resolvedName = resolveName(resourceName);
         return Resources.createInputStream(moduleName, resolvedName);
     }
@@ -1182,8 +1181,8 @@ private void checkPackageAccess(SecurityManager sm, ClassLoader ccl, boolean che
     }
 
     @Substitute
-    private static Target_jdk_internal_reflect_ReflectionFactory getReflectionFactory() {
-        return Target_jdk_internal_reflect_ReflectionFactory.getReflectionFactory();
+    private static ReflectionFactory getReflectionFactory() {
+        return ReflectionFactory.getReflectionFactory();
     }
 
     @KeepOriginal
@@ -1253,17 +1252,17 @@ private Constructor<?> getEnclosingConstructor() {
 
     @Substitute
     public static Class<?> forName(String className) throws ClassNotFoundException {
-        Class<?> caller = Target_jdk_internal_reflect_Reflection.getCallerClass();
+        Class<?> caller = Reflection.getCallerClass();
         return forName(className, true, caller.getClassLoader());
     }
 
     @Substitute //
-    public static Class<?> forName(@SuppressWarnings("unused") Target_java_lang_Module module, String className) {
+    public static Class<?> forName(@SuppressWarnings("unused") Module module, String className) {
         /*
          * The module system is not supported for now, therefore the module parameter is ignored and
          * we use the class loader of the caller class instead of the module's loader.
          */
-        Class<?> caller = Target_jdk_internal_reflect_Reflection.getCallerClass();
+        Class<?> caller = Reflection.getCallerClass();
         try {
             return forName(className, false, caller.getClassLoader());
         } catch (ClassNotFoundException e) {
@@ -1351,8 +1350,8 @@ public boolean desiredAssertionStatus() {
     }
 
     @Substitute //
-    public Target_java_lang_Module getModule() {
-        return (Target_java_lang_Module) module;
+    public Module getModule() {
+        return module;
     }
 
     @Substitute //
@@ -1504,7 +1503,7 @@ private void setSigners(@SuppressWarnings("unused") Object[] signers) {
     native byte[] getRawTypeAnnotations();
 
     @Delete
-    native Target_jdk_internal_reflect_ConstantPool getConstantPool();
+    native ConstantPool getConstantPool();
 
     @Delete
     private native Field[] getDeclaredFields0(boolean publicOnly);
@@ -1582,22 +1581,6 @@ final class Target_java_lang_Class_ReflectionData<T> {
     // Checkstyle: resume
 }
 
-@TargetClass(className = "jdk.internal.reflect.ReflectionFactory")
-final class Target_jdk_internal_reflect_ReflectionFactory {
-
-    @Alias //
-    private static Target_jdk_internal_reflect_ReflectionFactory soleInstance;
-
-    @Substitute
-    public static Target_jdk_internal_reflect_ReflectionFactory getReflectionFactory() {
-        return soleInstance;
-    }
-}
-
-@TargetClass(className = "jdk.internal.reflect.ConstantPool")
-final class Target_jdk_internal_reflect_ConstantPool {
-}
-
 @TargetClass(className = "java.lang.reflect.RecordComponent", onlyWith = JDK17OrLater.class)
 final class Target_java_lang_reflect_RecordComponent {
 }

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

@@ -682,7 +682,7 @@ private static Class<?> loadClassOrNull(String name) {
 
     @SuppressWarnings("unused")
     @Substitute
-    private static Class<?> loadClass(Target_java_lang_Module module, String name) {
+    private static Class<?> loadClass(Module module, String name) {
         /* The module system is not supported for now, therefore the module parameter is ignored. */
         return ClassForNameSupport.forNameOrNull(name, null);
     }

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

@@ -178,7 +178,7 @@ static void checkClassLoaderPermission(ClassLoader cl, Class<?> caller) {
 
     @Substitute //
     @SuppressWarnings("unused")
-    Class<?> loadClass(Target_java_lang_Module module, String name) {
+    Class<?> loadClass(Module module, String name) {
         /* The module system is not supported for now, therefore the module parameter is ignored. */
         try {
             return loadClass(name, false);

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

@@ -27,26 +27,24 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Arrays;
-import java.util.Map;
 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.resources.ResourceStorageEntry;
 
 @SuppressWarnings("unused")
 @TargetClass(value = java.lang.Module.class)
-public final class Target_java_lang_Module {
+final class Target_java_lang_Module {
 
     @Alias //
-    public String name;
+    private String name;
 
     @SuppressWarnings("static-method")
     @Substitute
-    public InputStream getResourceAsStream(String resourceName) {
+    private InputStream getResourceAsStream(String resourceName) {
         ResourceStorageEntry res = Resources.get(name, resourceName);
         return res == null ? null : new ByteArrayInputStream(res.getData().get(0));
     }
@@ -87,17 +85,4 @@ private static void addExportsToAllUnnamed0(Module from, String pn) {
             ModuleUtil.checkIsPackageContainedInModule(pn, from);
         }
     }
-
-    @TargetClass(className = "java.lang.Module", innerClass = "ReflectionData") //
-    private static final class Target_java_lang_Module_ReflectionData {
-
-        @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
-        static Target_java_lang_WeakPairMap<Module, Module, Boolean> reads;
-
-        @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
-        static Target_java_lang_WeakPairMap<Module, Module, Map<String, Boolean>> exports;
-
-        @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
-        static Target_java_lang_WeakPairMap<Module, Class<?>, Boolean> uses;
-    }
 }

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.jdk;
+
+import java.util.Map;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(value = Module.class, innerClass = "ReflectionData") //
+final class Target_java_lang_Module_ReflectionData {
+
+    @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
+    private static Target_java_lang_WeakPairMap<Module, Module, Boolean> reads;
+
+    @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
+    private static Target_java_lang_WeakPairMap<Module, Module, Map<String, Boolean>> exports;
+
+    @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
+    private static Target_java_lang_WeakPairMap<Module, Class<?>, Boolean> uses;
+}

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

@@ -31,10 +31,10 @@
 
 @SuppressWarnings({"unused"})
 @TargetClass(Package.class)
-public final class Target_java_lang_Package {
+final class Target_java_lang_Package {
 
     @Alias
-    public Target_java_lang_Package(String name,
+    Target_java_lang_Package(String name,
                     String spectitle, String specversion, String specvendor,
                     String impltitle, String implversion, String implvendor,
                     URL sealbase, ClassLoader loader) {

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

@@ -30,12 +30,12 @@
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 
-@TargetClass(className = "jdk.internal.reflect.Reflection")
-public final class Target_jdk_internal_reflect_Reflection {
+@TargetClass(value = jdk.internal.reflect.Reflection.class)
+final class Target_jdk_internal_reflect_Reflection {
 
     @Substitute
     @NeverInline("Starting a stack walk in the caller frame")
-    public static Class<?> getCallerClass() {
+    private static Class<?> getCallerClass() {
         return StackTraceUtils.getCallerClass(KnownIntrinsics.readCallerStackPointer(), true);
     }
 
@@ -44,7 +44,7 @@ private static int getClassAccessFlags(Class<?> cls) {
         return cls.getModifiers();
     }
 
-    @Substitute //
+    @Substitute
     private static boolean areNestMates(Class<?> currentClass, Class<?> memberClass) {
         return DynamicHub.fromClass(currentClass).isNestmateOf(memberClass);
     }

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

@@ -30,9 +30,9 @@
 import com.oracle.svm.core.annotate.TargetClass;
 
 /**
- * These substitutions are necessary because in JDK 11 the static initializations of these fields
- * are copies of the corresponding (recomputed) fields of {@link jdk.internal.misc.Unsafe}. But
- * copying a recomputed value during image building does not recompute the value. See GR-12640.
+ * These substitutions are necessary because the static initializations of these fields are copies
+ * of the corresponding (recomputed) fields of {@link jdk.internal.misc.Unsafe}. But copying a
+ * recomputed value during image building does not recompute the value. See GR-12640.
  */
 @TargetClass(value = sun.misc.Unsafe.class)
 final class Target_sun_misc_Unsafe {

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

@@ -36,7 +36,6 @@
 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.Target_java_lang_Module;
 import com.oracle.svm.core.jdk.localization.LocalizationSupport;
 import com.oracle.svm.core.jdk.localization.substitutions.modes.OptimizedLocaleMode;
 
@@ -89,12 +88,12 @@ private static ResourceBundle getBundle(String baseName, Locale targetLocale, Cl
      */
 
     @Substitute
-    private static ResourceBundle getBundle(String baseName, @SuppressWarnings("unused") Target_java_lang_Module module) {
+    private static ResourceBundle getBundle(String baseName, @SuppressWarnings("unused") Module module) {
         return ImageSingletons.lookup(LocalizationSupport.class).asOptimizedSupport().getCached(baseName, Locale.getDefault());
     }
 
     @Substitute
-    private static ResourceBundle getBundle(String baseName, Locale targetLocale, @SuppressWarnings("unused") Target_java_lang_Module module) {
+    private static ResourceBundle getBundle(String baseName, Locale targetLocale, @SuppressWarnings("unused") Module module) {
         return ImageSingletons.lookup(LocalizationSupport.class).asOptimizedSupport().getCached(baseName, targetLocale);
     }
 }