Crema reflection: wrap exceptions in InvocationTargetException

Author: gilles-duboscq

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/crema/CremaSupport.java

@@ -61,7 +61,11 @@ interface CremaDispatchTable {
 
     void fillDynamicHubInfo(DynamicHub hub, CremaDispatchTable table, List<Class<?>> transitiveSuperInterfaces, int[] interfaceIndices);
 
-    Object newInstance(ResolvedJavaMethod targetMethod, Object[] args);
+    /**
+     * Creates a new instance of {@code type} without running any constructor yet. The caller should
+     * make sure to run a constructor before publishing the result.
+     */
+    Object rawNewInstance(ResolvedJavaType type);
 
     Object execute(ResolvedJavaMethod targetMethod, Object[] args);
 

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

@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.reflect;
 
+import java.lang.reflect.InvocationTargetException;
+
 import com.oracle.svm.core.hub.crema.CremaSupport;
 import com.oracle.svm.core.jdk.InternalVMMethod;
 
 import jdk.internal.reflect.ConstructorAccessor;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-import org.graalvm.nativeimage.ImageSingletons;
-
 @InternalVMMethod
 public final class CremaConstructorAccessor extends AbstractCremaAccessor implements ConstructorAccessor {
 
@@ -40,9 +40,19 @@ public CremaConstructorAccessor(ResolvedJavaMethod targetMethod, Class<?> declar
     }
 
     @Override
-    public Object newInstance(Object[] args) {
+    public Object newInstance(Object[] args) throws InvocationTargetException {
         verifyArguments(args);
         ensureDeclaringClassInitialized();
-        return ImageSingletons.lookup(CremaSupport.class).newInstance(targetMethod, args);
+
+        Object newReference = CremaSupport.singleton().rawNewInstance(targetMethod.getDeclaringClass());
+        Object[] finalArgs = new Object[args.length + 1];
+        finalArgs[0] = newReference;
+        System.arraycopy(args, 0, finalArgs, 1, args.length);
+        try {
+            CremaSupport.singleton().execute(targetMethod, finalArgs);
+        } catch (Throwable t) {
+            throw new InvocationTargetException(t);
+        }
+        return newReference;
     }
 }

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

@@ -24,16 +24,15 @@
  */
 package com.oracle.svm.core.reflect;
 
+import java.lang.reflect.InvocationTargetException;
+
 import com.oracle.svm.core.hub.crema.CremaSupport;
 import com.oracle.svm.core.jdk.InternalVMMethod;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.internal.reflect.MethodAccessor;
-
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-import java.lang.reflect.InvocationTargetException;
-
 @InternalVMMethod
 public final class CremaMethodAccessor extends AbstractCremaAccessor implements MethodAccessor {
 
@@ -54,7 +53,11 @@ public Object invoke(Object obj, Object[] args) throws IllegalArgumentException,
         Object[] finalArgs = new Object[args.length + 1];
         finalArgs[0] = obj;
         System.arraycopy(args, 0, finalArgs, 1, args.length);
-        return CremaSupport.singleton().execute(targetMethod, finalArgs);
+        try {
+            return CremaSupport.singleton().execute(targetMethod, finalArgs);
+        } catch (Throwable t) {
+            throw new InvocationTargetException(t);
+        }
     }
 
     @Override

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/CremaSupportImpl.java

@@ -727,7 +727,7 @@ public Object execute(ResolvedJavaMethod targetMethod, Object[] args) {
     }
 
     @Override
-    public Object newInstance(ResolvedJavaMethod targetMethod, Object[] args) {
-        return Interpreter.newInstance((InterpreterResolvedJavaMethod) targetMethod, args);
+    public Object rawNewInstance(ResolvedJavaType type) {
+        return InterpreterToVM.createNewReference((InterpreterResolvedJavaType) type);
     }
 }

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/Interpreter.java

@@ -370,17 +370,6 @@ public static Object execute(InterpreterResolvedJavaMethod method, Object[] args
         return execute0(method, frame, forceStayInInterpreter);
     }
 
-    public static Object newInstance(InterpreterResolvedJavaMethod method, Object[] args) {
-        // this is a constructor call, so we have to allocate a new instance,
-        // expand this into args[0] and then execute
-        Object newReference = InterpreterToVM.createNewReference(method.getDeclaringClass());
-        Object[] finalArgs = new Object[args.length + 1];
-        finalArgs[0] = newReference;
-        System.arraycopy(args, 0, finalArgs, 1, args.length);
-        execute(method, finalArgs, false);
-        return newReference;
-    }
-
     private static Object execute0(InterpreterResolvedJavaMethod method, InterpreterFrame frame, boolean stayInInterpreter) {
         try {
             if (method.isSynchronized()) {