Remove support for wrapped arrays in panama backend, ensure post-call nodes are called in case of an exception

Author: otethal

truffle/src/com.oracle.truffle.nfi.backend.panama.jdk22/src/com/oracle/truffle/nfi/backend/panama/ArgumentNode.java

@@ -262,22 +262,7 @@ abstract static class ToArrayNode extends ArgumentNode {
             getArrayElementLayoutNode = GetArrayElementLayoutNode.create(type.type);
         }
 
-        final boolean isHostObject(Object value) {
-            return PanamaNFIContext.get(this).env.isHostObject(value);
-        }
-
-        final Object asHostObject(Object value) {
-            return PanamaNFIContext.get(this).env.asHostObject(value);
-        }
-
-        @Specialization(guards = {"isHostObject(value)", "elementLayout != null"})
-        MemorySegment doHostObject(Arena arena, @SuppressWarnings("unused") Object value,
-                        @Bind("asHostObject(value)") Object hostObject,
-                        @Bind("getArrayElementLayoutNode.execute(hostObject)") ValueLayout elementLayout) {
-            return doCopy(arena, hostObject, elementLayout);
-        }
-
-        @Specialization(guards = {"!isHostObject(value)", "elementLayout != null"})
+        @Specialization(guards = "elementLayout != null")
         MemorySegment doArray(Arena arena, Object value,
                         @Bind("getArrayElementLayoutNode.execute(value)") ValueLayout elementLayout) {
             return doCopy(arena, value, elementLayout);

truffle/src/com.oracle.truffle.nfi.backend.panama.jdk22/src/com/oracle/truffle/nfi/backend/panama/FunctionExecuteNode.java

@@ -106,8 +106,6 @@ static Object genericExecute(long receiver, PanamaSignature signature, Object[]
 
     abstract static class SignatureExecuteNode extends RootNode {
 
-        private static final PostCallArgumentNode[] EMPTY_POST_CALL_NODE_ARRAY = new PostCallArgumentNode[0];
-
         final CachedSignatureInfo signatureInfo;
         @Children ArgumentNode[] argNodes;
         @Children PostCallArgumentNode[] postCallArgNodes;
@@ -132,8 +130,6 @@ abstract static class SignatureExecuteNode extends RootNode {
                 for (int i = 0; i < argNodes.length; i++) {
                     postCallArgNodes[i] = argTypes[i].createPostCallArgumentNode();
                 }
-            } else {
-                this.postCallArgNodes = EMPTY_POST_CALL_NODE_ARRAY;
             }
         }
 
@@ -176,14 +172,18 @@ public Object doGeneric(VirtualFrame frame) {
                 } catch (UnsupportedTypeException ex) {
                     throw silenceException(RuntimeException.class, ex);
                 }
-
-                Object result = signatureInfo.execute(signature, convertedArgs, address, this);
-                for (int i = 0; i < postCallArgNodes.length; i++) {
-                    if (postCallArgNodes[i] != null) {
-                        postCallArgNodes[i].execute(args[i], convertedArgs[i]);
+                try {
+                    return signatureInfo.execute(signature, convertedArgs, address, this);
+                } finally {
+                    if (postCallArgNodes != null) {
+                        for (int i = 0; i < postCallArgNodes.length; i++) {
+                            if (postCallArgNodes[i] != null) {
+                                postCallArgNodes[i].execute(args[i], convertedArgs[i]);
+                            }
+                        }
                     }
                 }
-                return result;
+
             } finally {
                 if (needsArena) {
                     arena.close();

truffle/src/com.oracle.truffle.nfi.backend.panama.jdk22/src/com/oracle/truffle/nfi/backend/panama/PanamaType.java

@@ -101,7 +101,7 @@ public boolean needsPostCallProcessing() {
     }
 
     public boolean needsArena() {
-        return isArray | type == NativeSimpleType.STRING;
+        return isArray || type == NativeSimpleType.STRING;
     }
 
     public ArgumentNode createArgumentNode() {

truffle/src/com.oracle.truffle.nfi.backend.panama.jdk22/src/com/oracle/truffle/nfi/backend/panama/PostCallArgumentNode.java

@@ -68,22 +68,7 @@ abstract static class CopyBackArrayNode extends PostCallArgumentNode {
             getArrayElementLayoutNode = GetArrayElementLayoutNode.create(type.type);
         }
 
-        final boolean isHostObject(Object value) {
-            return PanamaNFIContext.get(this).env.isHostObject(value);
-        }
-
-        final Object asHostObject(Object value) {
-            return PanamaNFIContext.get(this).env.asHostObject(value);
-        }
-
-        @Specialization(guards = {"isHostObject(originalValue)", "elementLayout != null"})
-        void doHostObject(@SuppressWarnings("unused") Object originalValue, MemorySegment convertedValue,
-                        @Bind("asHostObject(originalValue)") Object hostObject,
-                        @Bind("getArrayElementLayoutNode.execute(hostObject)") ValueLayout elementLayout) {
-            doCopy(hostObject, convertedValue, elementLayout);
-        }
-
-        @Specialization(guards = {"!isHostObject(originalValue)", "elementLayout != null"})
+        @Specialization(guards = "elementLayout != null")
         void doArray(Object originalValue, MemorySegment convertedValue,
                         @Bind("getArrayElementLayoutNode.execute(originalValue)") ValueLayout elementLayout) {
             doCopy(originalValue, convertedValue, elementLayout);

truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/ArrayNFITest.java

@@ -49,6 +49,7 @@
 
 import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -178,6 +179,8 @@ public void testSumArrayDirect(@Inject(CreateAndSumArray.class) CallTarget callT
 
     @Test
     public void testSumArrayWrapped(@Inject(CreateAndSumArray.class) CallTarget callTarget) {
+        // Panama backend does not support wrapped arrays
+        Assume.assumeFalse("panama".equals(TEST_BACKEND));
         Object array = Array.newInstance(javaType, 5);
         Object wrappedArray = runWithPolyglot.getTruffleTestEnv().asGuestValue(array);
         testSumArray(callTarget, array, wrappedArray);