Crema: un/rebasic for compiled linkTo calls

Signature polymorphic susbsitutions use stack kinds.

Author: gilles-duboscq

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

@@ -42,6 +42,7 @@
 import static com.oracle.svm.espresso.classfile.Constants.ACC_SUPER;
 import static com.oracle.svm.espresso.classfile.Constants.JVM_ACC_WRITTEN_FLAGS;
 import static com.oracle.svm.espresso.shared.meta.SignaturePolymorphicIntrinsic.InvokeGeneric;
+import static com.oracle.svm.interpreter.Interpreter.unbasic;
 import static com.oracle.svm.interpreter.InterpreterStubSection.getCremaStubForVTableIndex;
 
 import java.lang.invoke.MethodType;
@@ -122,6 +123,7 @@
 import com.oracle.svm.interpreter.metadata.InterpreterResolvedJavaMethod;
 import com.oracle.svm.interpreter.metadata.InterpreterResolvedJavaType;
 import com.oracle.svm.interpreter.metadata.InterpreterResolvedObjectType;
+import com.oracle.svm.interpreter.metadata.InterpreterUnresolvedSignature;
 
 import jdk.graal.compiler.word.Word;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -1312,12 +1314,15 @@ public Object invokeBasic(Target_java_lang_invoke_MemberName memberName, Object
     @Override
     public Object linkToVirtual(Object[] args) {
         // This is AOT-compiled code calling MethodHandle.linkToVirtual
+        // See also PolymorphicSignatureWrapperMethod.buildGraph
         Target_java_lang_invoke_MemberName mnTarget = (Target_java_lang_invoke_MemberName) args[args.length - 1];
         InterpreterResolvedJavaMethod target = InterpreterResolvedJavaMethod.fromMemberName(mnTarget);
-        Object[] basicArgs = Arrays.copyOf(args, args.length - 1);
+        InterpreterUnresolvedSignature signature = target.getSignature();
+        Object[] basicArgs = unbasic(args, signature, true);
         logIntrinsic("[from compiled] linkToVirtual ", target, basicArgs);
         try {
-            return InterpreterToVM.dispatchInvocation(target, basicArgs, true, false, false, false, true);
+            Object result = InterpreterToVM.dispatchInvocation(target, basicArgs, true, false, false, false, true);
+            return Interpreter.rebasic(result, signature.getReturnKind());
         } catch (SemanticJavaException e) {
             throw uncheckedThrow(e.getCause());
         }
@@ -1326,12 +1331,15 @@ public Object linkToVirtual(Object[] args) {
     @Override
     public Object linkToStatic(Object[] args) {
         // This is AOT-compiled code calling MethodHandle.linkToStatic
+        // See also PolymorphicSignatureWrapperMethod.buildGraph
         Target_java_lang_invoke_MemberName mnTarget = (Target_java_lang_invoke_MemberName) args[args.length - 1];
         InterpreterResolvedJavaMethod target = InterpreterResolvedJavaMethod.fromMemberName(mnTarget);
-        Object[] basicArgs = Arrays.copyOf(args, args.length - 1);
+        InterpreterUnresolvedSignature signature = target.getSignature();
+        Object[] basicArgs = unbasic(args, signature, false);
         logIntrinsic("[from compiled] linkToStatic ", target, basicArgs);
         try {
-            return InterpreterToVM.dispatchInvocation(target, basicArgs, false, false, false, false, true);
+            Object result = InterpreterToVM.dispatchInvocation(target, basicArgs, false, false, false, false, true);
+            return Interpreter.rebasic(result, signature.getReturnKind());
         } catch (SemanticJavaException e) {
             throw uncheckedThrow(e.getCause());
         }
@@ -1340,12 +1348,15 @@ public Object linkToStatic(Object[] args) {
     @Override
     public Object linkToSpecial(Object[] args) {
         // This is AOT-compiled code calling MethodHandle.linkToSpecial
+        // See also PolymorphicSignatureWrapperMethod.buildGraph
         Target_java_lang_invoke_MemberName mnTarget = (Target_java_lang_invoke_MemberName) args[args.length - 1];
         InterpreterResolvedJavaMethod target = InterpreterResolvedJavaMethod.fromMemberName(mnTarget);
-        Object[] basicArgs = Arrays.copyOf(args, args.length - 1);
+        InterpreterUnresolvedSignature signature = target.getSignature();
+        Object[] basicArgs = unbasic(args, signature, true);
         logIntrinsic("[from compiled] linkToSpecial ", target, basicArgs);
         try {
-            return InterpreterToVM.dispatchInvocation(target, basicArgs, false, false, false, false, true);
+            Object result = InterpreterToVM.dispatchInvocation(target, basicArgs, false, false, false, false, true);
+            return Interpreter.rebasic(result, signature.getReturnKind());
         } catch (SemanticJavaException e) {
             throw uncheckedThrow(e.getCause());
         }
@@ -1354,12 +1365,15 @@ public Object linkToSpecial(Object[] args) {
     @Override
     public Object linkToInterface(Object[] args) {
         // This is AOT-compiled code calling MethodHandle.linkToInterface
+        // See also PolymorphicSignatureWrapperMethod.buildGraph
         Target_java_lang_invoke_MemberName mnTarget = (Target_java_lang_invoke_MemberName) args[args.length - 1];
         InterpreterResolvedJavaMethod target = InterpreterResolvedJavaMethod.fromMemberName(mnTarget);
-        Object[] basicArgs = Arrays.copyOf(args, args.length - 1);
+        InterpreterUnresolvedSignature signature = target.getSignature();
+        Object[] basicArgs = unbasic(args, signature, true);
         logIntrinsic("[from compiled] linkToInterface ", target, basicArgs);
         try {
-            return InterpreterToVM.dispatchInvocation(target, basicArgs, true, false, false, true, true);
+            Object result = InterpreterToVM.dispatchInvocation(target, basicArgs, true, false, false, true, true);
+            return Interpreter.rebasic(result, signature.getReturnKind());
         } catch (SemanticJavaException e) {
             throw uncheckedThrow(e.getCause());
         }

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

@@ -573,7 +573,10 @@ private static InterpreterResolvedJavaMethod getLinkToTarget(InterpreterFrame fr
     }
 
     private static Object[] unbasic(InterpreterFrame frame, InterpreterUnresolvedSignature targetSig, boolean inclReceiver) {
-        Object[] arguments = frame.getArguments();
+        return unbasic(frame.getArguments(), targetSig, inclReceiver);
+    }
+
+    static Object[] unbasic(Object[] arguments, InterpreterUnresolvedSignature targetSig, boolean inclReceiver) {
         int parameterCount = targetSig.getParameterCount(inclReceiver);
         Object[] res = new Object[parameterCount];
         int start = 0;
@@ -588,7 +591,7 @@ private static Object[] unbasic(InterpreterFrame frame, InterpreterUnresolvedSig
     }
 
     // Transforms ints to sub-words
-    public static Object unbasic(Object arg, JavaKind kind) {
+    private static Object unbasic(Object arg, JavaKind kind) {
         return switch (kind) {
             case Boolean -> (int) arg != 0;
             case Byte -> (byte) (int) arg;
@@ -598,7 +601,7 @@ public static Object unbasic(Object arg, JavaKind kind) {
         };
     }
 
-    private static Object rebasic(Object value, JavaKind returnType) {
+    static Object rebasic(Object value, JavaKind returnType) {
         // @formatter:off
         return switch (returnType) {
             case Boolean -> stackIntToBoolean((int) value);