[GR-46267] Test and fix invocation of Java proxies when they communicate an argument error via UnsupportedOperationException

PullRequest: graalpython/2790

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

@@ -50,6 +50,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.graalvm.polyglot.Context;
@@ -60,9 +61,12 @@
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyArray;
 import org.graalvm.polyglot.proxy.ProxyHashMap;
+import org.graalvm.polyglot.proxy.ProxyExecutable;
+import org.graalvm.polyglot.proxy.ProxyObject;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.Ignore;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -324,6 +328,53 @@ public void accessSuitePy() throws IOException {
             assertEquals("'e39957904b7e79caf4fa54f30e8e4ee74d4e9e37'", dacapo.getHashValue("sha1").toString());
         }
 
+        public class AForeignExecutable implements ProxyExecutable {
+            @Override
+            public Object execute(Value... arguments) {
+                throw new UnsupportedOperationException("wrong arity");
+            }
+        }
+
+        @Ignore // blocked by GR-46281
+        @Test
+        public void runAForeignExecutable() throws IOException {
+            Source suitePy = Source.newBuilder("python",
+                            """
+                                            def foo(obj):
+                                              try:
+                                                 obj()
+                                              except TypeError as e:
+                                                 pass
+                                              else:
+                                                 assert False
+                                            foo
+                                            """,
+                            "suite.py").build();
+            Value foo = context.eval(suitePy);
+            foo.execute(new AForeignExecutable());
+        }
+
+        @Ignore // blocked by GR-46281
+        @Test
+        public void invokeAForeignMember() throws IOException {
+            Source suitePy = Source.newBuilder("python",
+                            """
+                                            def foo(obj):
+                                              try:
+                                                 obj.fun()
+                                              except TypeError as e:
+                                                 pass
+                                              else:
+                                                 assert False
+                                            foo
+                                            """,
+                            "suite.py").build();
+            Map<String, Object> m = new HashMap<>();
+            m.put("fun", new AForeignExecutable());
+            Value foo = context.eval(suitePy);
+            foo.execute(ProxyObject.fromMap(m));
+        }
+
         @ExportLibrary(InteropLibrary.class)
         public static class ForeignObjectWithOOInvoke implements TruffleObject {
             public String getMyName() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallNode.java

@@ -193,10 +193,10 @@ protected Object doForeignMethod(ForeignMethod callable, Object[] arguments, PKe
         gil.release(true);
         try {
             return fromForeign.executeConvert(interop.invokeMember(callable.receiver, callable.methodName, arguments));
-        } catch (ArityException | UnsupportedTypeException e) {
+        } catch (ArityException | UnsupportedTypeException | UnsupportedMessageException e) {
             typeError.enter(inliningTarget);
             throw raise.raise(TypeError, e);
-        } catch (UnknownIdentifierException | UnsupportedMessageException e) {
+        } catch (UnknownIdentifierException e) {
             // PyObjectGetMethod is supposed to have checked isMemberInvocable
             throw CompilerDirectives.shouldNotReachHere("Cannot invoke member");
         } finally {