Remove SubstrateReflectionAccessorFactory

Author: Christian Wimmer

substratevm/mx.substratevm/suite.py

@@ -425,6 +425,7 @@
                     "sun.util.resources",
                     "jdk.internal.module",
                     "sun.text.spi",
+                    "jdk.internal.reflect",
                 ],
                 "jdk.internal.vm.ci" : [
                     "jdk.vm.ci.runtime",
@@ -756,6 +757,7 @@
             "requiresConcealed" : {
                 "java.base" : [
                     "sun.invoke.util",
+                    "jdk.internal.reflect",
                 ],
             },
             "checkstyle": "com.oracle.svm.core",

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk11/reflect/SubstrateReflectionAccessorFactoryJDK11.java

@@ -34,8 +34,10 @@
 import com.oracle.svm.core.jdk.InternalVMMethod;
 import com.oracle.svm.core.util.VMError;
 
+import jdk.internal.reflect.ConstructorAccessor;
+
 @InternalVMMethod
-public abstract class SubstrateConstructorAccessor {
+public final class SubstrateConstructorAccessor implements ConstructorAccessor {
 
     interface ConstructorNewInstanceFunctionPointer extends CFunctionPointer {
         /** Must match the signature of {@link ReflectionAccessorHolder#newInstancePrototype}. */
@@ -46,11 +48,12 @@ interface ConstructorNewInstanceFunctionPointer extends CFunctionPointer {
     private final Executable member;
     private final CFunctionPointer newInstanceFunctionPointer;
 
-    protected SubstrateConstructorAccessor(Executable member, CFunctionPointer newInstanceFunctionPointer) {
+    public SubstrateConstructorAccessor(Executable member, CFunctionPointer newInstanceFunctionPointer) {
         this.member = member;
         this.newInstanceFunctionPointer = newInstanceFunctionPointer;
     }
 
+    @Override
     public Object newInstance(Object[] args) {
         ConstructorNewInstanceFunctionPointer functionPointer = (ConstructorNewInstanceFunctionPointer) this.newInstanceFunctionPointer;
         if (functionPointer.isNull()) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/SubstrateConstructorAccessor.java

@@ -34,8 +34,10 @@
 import com.oracle.svm.core.jdk.InternalVMMethod;
 import com.oracle.svm.core.util.VMError;
 
+import jdk.internal.reflect.MethodAccessor;
+
 @InternalVMMethod
-public abstract class SubstrateMethodAccessor {
+public final class SubstrateMethodAccessor implements MethodAccessor {
 
     interface MethodInvokeFunctionPointer extends CFunctionPointer {
         /** Must match the signature of {@link ReflectionAccessorHolder#invokePrototype}. */
@@ -46,11 +48,12 @@ interface MethodInvokeFunctionPointer extends CFunctionPointer {
     private final Executable member;
     private final CFunctionPointer invokeFunctionPointer;
 
-    protected SubstrateMethodAccessor(Executable member, CFunctionPointer invokeFunctionPointer) {
+    public SubstrateMethodAccessor(Executable member, CFunctionPointer invokeFunctionPointer) {
         this.member = member;
         this.invokeFunctionPointer = invokeFunctionPointer;
     }
 
+    @Override
     public Object invoke(Object obj, Object[] args) {
         MethodInvokeFunctionPointer functionPointer = (MethodInvokeFunctionPointer) this.invokeFunctionPointer;
         if (functionPointer.isNull()) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/SubstrateMethodAccessor.java

@@ -44,7 +44,6 @@
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CEntryPointLiteral;
 import org.graalvm.nativeimage.c.function.CFunction;
@@ -84,6 +83,8 @@
 import com.oracle.svm.core.hub.DynamicHubSupport;
 import com.oracle.svm.core.hub.LayoutEncoding;
 import com.oracle.svm.core.meta.MethodPointer;
+import com.oracle.svm.core.reflect.SubstrateConstructorAccessor;
+import com.oracle.svm.core.reflect.SubstrateMethodAccessor;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl.BeforeAnalysisAccessImpl;
 import com.oracle.svm.hosted.HostedConfiguration;
@@ -368,22 +369,9 @@ private void buildProfilingInformation() {
                     CEntryPointLiteral.class,
                     BoxedRelocatedPointer.class,
                     FunctionPointerHolder.class,
+                    SubstrateMethodAccessor.class, SubstrateConstructorAccessor.class,
                     FillerObject.class));
 
-    static {
-        try {
-            if (JavaVersionUtil.JAVA_SPEC >= 11) {
-                IMMUTABLE_TYPES.add(Class.forName("com.oracle.svm.core.jdk11.reflect.SubstrateMethodAccessorJDK11"));
-                IMMUTABLE_TYPES.add(Class.forName("com.oracle.svm.core.jdk11.reflect.SubstrateConstructorAccessorJDK11"));
-            } else {
-                IMMUTABLE_TYPES.add(Class.forName("com.oracle.svm.core.jdk8.reflect.SubstrateMethodAccessorJDK8"));
-                IMMUTABLE_TYPES.add(Class.forName("com.oracle.svm.core.jdk8.reflect.SubstrateConstructorAccessorJDK8"));
-            }
-        } catch (ClassNotFoundException ex) {
-            throw VMError.shouldNotReachHere(ex);
-        }
-    }
-
     private void collectMonitorFieldInfo(BigBang bb) {
         if (!SubstrateOptions.MultiThreaded.getValue()) {
             /* No locking information needed in single-threaded mode. */

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/SubstrateReflectionAccessorFactory.java

@@ -56,7 +56,6 @@
 import com.oracle.svm.core.reflect.ReflectionAccessorHolder;
 import com.oracle.svm.core.reflect.SubstrateConstructorAccessor;
 import com.oracle.svm.core.reflect.SubstrateMethodAccessor;
-import com.oracle.svm.core.reflect.SubstrateReflectionAccessorFactory;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FallbackFeature;
 import com.oracle.svm.hosted.FeatureImpl;
@@ -128,7 +127,7 @@ private Object createAccessor(Executable member) {
                 ResolvedJavaMethod prototype = analysisAccess.getMetaAccess().lookupJavaMethod(invokePrototype).getWrapped();
                 invokeMethod = createReflectiveInvokeMethod(name, prototype, (Method) member);
             }
-            return ImageSingletons.lookup(SubstrateReflectionAccessorFactory.class).createMethodAccessor(member, register(invokeMethod));
+            return new SubstrateMethodAccessor(member, register(invokeMethod));
 
         } else {
             ResolvedJavaMethod newInstanceMethod;
@@ -145,7 +144,7 @@ private Object createAccessor(Executable member) {
                 ResolvedJavaMethod prototype = analysisAccess.getMetaAccess().lookupJavaMethod(newInstancePrototype).getWrapped();
                 newInstanceMethod = createReflectiveNewInstanceMethod(name, prototype, (Constructor<?>) member);
             }
-            return ImageSingletons.lookup(SubstrateReflectionAccessorFactory.class).createConstructorAccessor(member, register(newInstanceMethod));
+            return new SubstrateConstructorAccessor(member, register(newInstanceMethod));
         }
     }