[GR-53405] Type mapping perf improvements.

PullRequest: graal/17480

Author: javeleon

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/EspressoForeignProxyGenerator.java

@@ -727,7 +727,7 @@ private void generateMethod(ClassWriter cw) {
             Label throwableHandler = new Label();
 
             List<Klass> catchList = computeUniqueCatchList(exceptionTypes);
-            if (catchList.size() > 0) {
+            if (!catchList.isEmpty()) {
                 for (Klass ex : catchList) {
                     mv.visitTryCatchBlock(startBlock, endBlock, runtimeHandler,
                                     dotToSlash(ex.getNameAsString()));
@@ -738,11 +738,26 @@ private void generateMethod(ClassWriter cw) {
             }
             mv.visitLabel(startBlock);
 
+            String invokeName;
+            String invokeSig;
+
             if (returnType.isPrimitive()) {
                 JavaKind kind = returnType.getJavaKind();
-                mv.visitLdcInsn(Type.getType(kind.toBoxedJavaClass()));
+                if (kind == JavaKind.Char) {
+                    mv.visitLdcInsn(Type.getType(kind.toBoxedJavaClass()));
+                    invokeName = "invokeMemberWithCast";
+                    invokeSig = "(Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/String;" +
+                                    "[Ljava/lang/Object;)Ljava/lang/Object;";
+                } else {
+                    invokeName = "invokeMember";
+                    invokeSig = "(Ljava/lang/Object;Ljava/lang/String;" +
+                                    "[Ljava/lang/Object;)Ljava/lang/Object;";
+                }
             } else {
                 mv.visitLdcInsn(Type.getType(returnType.getTypeAsString()));
+                invokeName = "invokeMemberWithCast";
+                invokeSig = "(Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/String;" +
+                                "[Ljava/lang/Object;)Ljava/lang/Object;";
             }
 
             mv.visitVarInsn(ALOAD, 0);
@@ -764,9 +779,8 @@ private void generateMethod(ClassWriter cw) {
                 mv.visitTypeInsn(ANEWARRAY, JL_OBJECT);
             }
             mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop",
-                            "invokeMemberWithCast",
-                            "(Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/String;" +
-                                            "[Ljava/lang/Object;)Ljava/lang/Object;",
+                            invokeName,
+                            invokeSig,
                             false);
 
             if (returnType == meta._void) {
@@ -839,27 +853,42 @@ private void codeWrapArgument(MethodVisitor mv, Klass type, int slot) {
         private void codeUnwrapReturnValue(MethodVisitor mv, Klass type) {
             if (type.isPrimitive()) {
                 JavaKind kind = JavaKind.fromTypeString(type.getTypeAsString());
-                String wrapperClassName = dotToSlash(kind.toBoxedJavaClass().getName());
-                mv.visitTypeInsn(CHECKCAST, wrapperClassName);
-                mv.visitMethodInsn(INVOKEVIRTUAL,
-                                wrapperClassName,
-                                kind.getUnwrapMethodName(), kind.getUnwrapMethodDesc(), false);
 
                 switch (kind) {
+                    case Char:
+                        String wrapperClassName = dotToSlash(kind.toBoxedJavaClass().getName());
+                        mv.visitTypeInsn(CHECKCAST, wrapperClassName);
+                        mv.visitMethodInsn(INVOKEVIRTUAL,
+                                        wrapperClassName,
+                                        kind.getUnwrapMethodName(), kind.getUnwrapMethodDesc(), false);
+                        mv.visitInsn(IRETURN);
+                        break;
                     case Int:
+                        mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop", "asInt", "(Ljava/lang/Object;)I", false);
+                        mv.visitInsn(IRETURN);
+                        break;
                     case Boolean:
+                        mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop", "asBoolean", "(Ljava/lang/Object;)Z", false);
+                        mv.visitInsn(IRETURN);
+                        break;
                     case Byte:
+                        mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop", "asByte", "(Ljava/lang/Object;)B", false);
+                        mv.visitInsn(IRETURN);
+                        break;
                     case Short:
-                    case Char:
+                        mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop", "asShort", "(Ljava/lang/Object;)S", false);
                         mv.visitInsn(IRETURN);
                         break;
                     case Long:
+                        mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop", "asLong", "(Ljava/lang/Object;)J", false);
                         mv.visitInsn(LRETURN);
                         break;
                     case Float:
+                        mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop", "asFloat", "(Ljava/lang/Object;)F", false);
                         mv.visitInsn(FRETURN);
                         break;
                     case Double:
+                        mv.visitMethodInsn(INVOKESTATIC, "com/oracle/truffle/espresso/polyglot/Interop", "asDouble", "(Ljava/lang/Object;)D", false);
                         mv.visitInsn(DRETURN);
                         break;
                     default:

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_com_oracle_truffle_espresso_polyglot_Interop.java

@@ -2088,6 +2088,10 @@ StaticObject doCached(
                         @Cached LookupTypeConverterNode lookupTypeConverterNode,
                         @Cached LookupInternalTypeConverterNode lookupInternalTypeConverterNode,
                         @Cached BranchProfile exceptionProfile) {
+            if (StaticObject.isNull(targetClass)) {
+                exceptionProfile.enter();
+                throw meta.throwNullPointerException();
+            }
             assert InteropLibrary.getUncached().isString(member);
             String hostMember = getMeta().toHostString(member);
             try {