[GR-33636] Do not use a separate class for each reflectively invoked method.

PullRequest: graal/9731

Author: Christian Wimmer

substratevm/mx.substratevm/suite.py

@@ -204,6 +204,7 @@
             "requiresConcealed" : {
                 "java.base" : [
                     "jdk.internal.module",
+                    "jdk.internal.reflect",
                     "jdk.internal.misc",
                     "jdk.internal.logger",
                     "jdk.internal.loader",

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

@@ -0,0 +1,70 @@
+/*
+ * 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.jdk11.reflect;
+
+// Checkstyle: allow reflection
+
+import java.lang.reflect.Executable;
+
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.c.function.CFunctionPointer;
+import org.graalvm.nativeimage.hosted.Feature;
+
+import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.reflect.SubstrateConstructorAccessor;
+import com.oracle.svm.core.reflect.SubstrateMethodAccessor;
+import com.oracle.svm.core.reflect.SubstrateReflectionAccessorFactory;
+
+final class SubstrateReflectionAccessorFactoryJDK11 implements SubstrateReflectionAccessorFactory {
+    @Override
+    public SubstrateMethodAccessor createMethodAccessor(Executable member, CFunctionPointer invokeFunctionPointer, CFunctionPointer invokeSpecialFunctionPointer) {
+        return new SubstrateMethodAccessorJDK11(member, invokeFunctionPointer, invokeSpecialFunctionPointer);
+    }
+
+    @Override
+    public SubstrateConstructorAccessor createConstructorAccessor(Executable member, CFunctionPointer newInstanceFunctionPointer) {
+        return new SubstrateConstructorAccessorJDK11(member, newInstanceFunctionPointer);
+    }
+}
+
+@AutomaticFeature
+final class SubstrateReflectionAccessorFactoryJDK11Feature implements Feature {
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        ImageSingletons.add(SubstrateReflectionAccessorFactory.class, new SubstrateReflectionAccessorFactoryJDK11());
+    }
+}
+
+final class SubstrateMethodAccessorJDK11 extends SubstrateMethodAccessor implements jdk.internal.reflect.MethodAccessor {
+    SubstrateMethodAccessorJDK11(Executable member, CFunctionPointer invokeFunctionPointer, CFunctionPointer invokeSpecialFunctionPointer) {
+        super(member, invokeFunctionPointer, invokeSpecialFunctionPointer);
+    }
+}
+
+final class SubstrateConstructorAccessorJDK11 extends SubstrateConstructorAccessor implements jdk.internal.reflect.ConstructorAccessor {
+    SubstrateConstructorAccessorJDK11(Executable member, CFunctionPointer newInstanceFunctionPointer) {
+        super(member, newInstanceFunctionPointer);
+    }
+}

substratevm/src/com.oracle.svm.core.jdk8/src/com/oracle/svm/core/jdk8/reflect/SubstrateReflectionAccessorFactoryJDK8.java

@@ -0,0 +1,70 @@
+/*
+ * 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.jdk8.reflect;
+
+// Checkstyle: allow reflection
+
+import java.lang.reflect.Executable;
+
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.c.function.CFunctionPointer;
+import org.graalvm.nativeimage.hosted.Feature;
+
+import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.reflect.SubstrateConstructorAccessor;
+import com.oracle.svm.core.reflect.SubstrateMethodAccessor;
+import com.oracle.svm.core.reflect.SubstrateReflectionAccessorFactory;
+
+final class SubstrateReflectionAccessorFactoryJDK8 implements SubstrateReflectionAccessorFactory {
+    @Override
+    public SubstrateMethodAccessor createMethodAccessor(Executable member, CFunctionPointer invokeFunctionPointer, CFunctionPointer invokeSpecialFunctionPointer) {
+        return new SubstrateMethodAccessorJDK8(member, invokeFunctionPointer, invokeSpecialFunctionPointer);
+    }
+
+    @Override
+    public SubstrateConstructorAccessor createConstructorAccessor(Executable member, CFunctionPointer newInstanceFunctionPointer) {
+        return new SubstrateConstructorAccessorJDK8(member, newInstanceFunctionPointer);
+    }
+}
+
+@AutomaticFeature
+final class SubstrateReflectionAccessorFactoryJDK8Feature implements Feature {
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        ImageSingletons.add(SubstrateReflectionAccessorFactory.class, new SubstrateReflectionAccessorFactoryJDK8());
+    }
+}
+
+final class SubstrateMethodAccessorJDK8 extends SubstrateMethodAccessor implements sun.reflect.MethodAccessor {
+    SubstrateMethodAccessorJDK8(Executable member, CFunctionPointer invokeFunctionPointer, CFunctionPointer invokeSpecialFunctionPointer) {
+        super(member, invokeFunctionPointer, invokeSpecialFunctionPointer);
+    }
+}
+
+final class SubstrateConstructorAccessorJDK8 extends SubstrateConstructorAccessor implements sun.reflect.ConstructorAccessor {
+    SubstrateConstructorAccessorJDK8(Executable member, CFunctionPointer newInstanceFunctionPointer) {
+        super(member, newInstanceFunctionPointer);
+    }
+}

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java

@@ -25,18 +25,20 @@
 package com.oracle.svm.core.classinitialization;
 
 // Checkstyle: stop
+
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import com.oracle.svm.core.jdk.InternalVMMethod;
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 
 import com.oracle.svm.core.annotate.InvokeJavaFunctionPointer;
 import com.oracle.svm.core.hub.DynamicHub;
+import com.oracle.svm.core.jdk.InternalVMMethod;
 import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;
+import com.oracle.svm.core.util.VMError;
 
 import sun.misc.Unsafe;
 // Checkstyle: resume
@@ -294,7 +296,7 @@ private static void initialize(ClassInitializationInfo info, DynamicHub hub) {
         Throwable exception = null;
         try {
             /* Step 9: Next, execute the class or interface initialization method of C. */
-            info.invokeClassInitializer();
+            info.invokeClassInitializer(hub);
         } catch (Throwable ex) {
             exception = ex;
         }
@@ -372,9 +374,17 @@ private void setInitializationStateAndNotify(InitState state) {
         }
     }
 
-    private void invokeClassInitializer() {
+    private void invokeClassInitializer(DynamicHub hub) {
         if (classInitializer != null) {
-            ((ClassInitializerFunctionPointer) classInitializer.functionPointer).invoke();
+            ClassInitializerFunctionPointer functionPointer = (ClassInitializerFunctionPointer) classInitializer.functionPointer;
+            if (functionPointer.isNull()) {
+                throw invokeClassInitializerError(hub);
+            }
+            functionPointer.invoke();
         }
     }
+
+    private static RuntimeException invokeClassInitializerError(DynamicHub hub) {
+        throw VMError.shouldNotReachHere("No classInitializer.functionPointer for class " + hub.getName());
+    }
 }

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

@@ -0,0 +1,64 @@
+/*
+ * 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.reflect;
+
+import com.oracle.svm.core.jdk.InternalVMMethod;
+import com.oracle.svm.core.util.VMError;
+
+/**
+ * This class is used as the declaring class for reflection invocation methods. These methods have
+ * manually created Graal IR, and are invoked via a function pointer call from
+ * {@link SubstrateMethodAccessor} and {@link SubstrateConstructorAccessor}
+ */
+@InternalVMMethod
+@SuppressWarnings("unused")
+public final class ReflectionAccessorHolder {
+
+    /**
+     * Signature prototype for invoking a method via a {@link SubstrateMethodAccessor}.
+     */
+    private static Object invokePrototype(Object obj, Object[] args) {
+        throw VMError.shouldNotReachHere("Only used as a prototype for generated methods");
+    }
+
+    /**
+     * Signature prototype for allocating a new instance via a {@link SubstrateConstructorAccessor}.
+     */
+    private static Object newInstancePrototype(Object[] args) {
+        throw VMError.shouldNotReachHere("Only used as a prototype for generated methods");
+    }
+
+    /*
+     * Methods for throwing exceptions when a method or constructor is used in an illegal way.
+     */
+
+    private static Object invokeSpecialError(Object obj, Object[] args) {
+        throw new IllegalArgumentException("Static or abstract method cannot be invoked using invokeSpecial");
+    }
+
+    private static Object newInstanceError(Object[] args) throws InstantiationException {
+        throw new InstantiationException("Only non-abstract instance classes can be instantiated using reflection");
+    }
+}

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

@@ -0,0 +1,64 @@
+/*
+ * 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.reflect;
+
+// Checkstyle: allow reflection
+
+import java.lang.reflect.Executable;
+
+import org.graalvm.nativeimage.c.function.CFunctionPointer;
+
+import com.oracle.svm.core.annotate.InvokeJavaFunctionPointer;
+import com.oracle.svm.core.jdk.InternalVMMethod;
+import com.oracle.svm.core.util.VMError;
+
+@InternalVMMethod
+public abstract class SubstrateConstructorAccessor {
+
+    interface ConstructorNewInstanceFunctionPointer extends CFunctionPointer {
+        @InvokeJavaFunctionPointer
+        Object invoke(Object[] args);
+    }
+
+    private final Executable member;
+    private final CFunctionPointer newInstanceFunctionPointer;
+
+    protected SubstrateConstructorAccessor(Executable member, CFunctionPointer newInstanceFunctionPointer) {
+        this.member = member;
+        this.newInstanceFunctionPointer = newInstanceFunctionPointer;
+    }
+
+    public Object newInstance(Object[] args) {
+        ConstructorNewInstanceFunctionPointer functionPointer = (ConstructorNewInstanceFunctionPointer) this.newInstanceFunctionPointer;
+        if (functionPointer.isNull()) {
+            throw newInstanceError();
+        }
+        return functionPointer.invoke(args);
+    }
+
+    private RuntimeException newInstanceError() {
+        throw VMError.shouldNotReachHere("No SubstrateConstructorAccessor.newInstanceFunctionPointer for " + member);
+    }
+}