add missing foreign_object.__getattr__ and fix calling well-known Python methods directly on a foreign object

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_interop.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -268,3 +268,13 @@ def test_non_index_array_access():
             assert False, "using __getitem__ to access keys of an array-like foreign object should work"
         except NotImplementedError as e:
             assert "host lookup is not allowed" in str(e)
+
+    def test_direct_call_of_truffle_object_methods():
+        import java
+        try:
+            al = java.type("java.util.ArrayList")()
+            assert al.__len__() == al.size() == len(al)
+        except IndexError:
+            assert False, "calling the python equivalents for well-known functions directly should work"
+        except NotImplementedError as e:
+            assert "host lookup is not allowed" in str(e)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/TruffleObjectBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -34,6 +34,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DIR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__FLOORDIV__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GT__;
@@ -875,6 +876,22 @@ Object doit(TruffleObject object, Object key) {
         }
     }
 
+    @Builtin(name = __GETATTR__, fixedNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class GetattrNode extends PythonBinaryBuiltinNode {
+        @Child Node readNode = Message.READ.createNode();
+        @Child PForeignToPTypeNode toPythonNode = PForeignToPTypeNode.create();
+
+        @Specialization
+        protected Object doIt(TruffleObject object, Object key) {
+            try {
+                return toPythonNode.executeConvert(ForeignAccess.sendRead(readNode, object, key));
+            } catch (UnknownIdentifierException | UnsupportedMessageException e) {
+                throw raise(PythonErrorType.AttributeError, "foreign object %s has no attribute %s", object, key);
+            }
+        }
+    }
+
     @Builtin(name = __SETATTR__, fixedNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     abstract static class SetattrNode extends UnboxNode {

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

@@ -31,11 +31,11 @@
 import com.oracle.graal.python.nodes.argument.keywords.KeywordArgumentsNode;
 import com.oracle.graal.python.nodes.argument.positional.PositionalArgumentsNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.attributes.GetAttributeNode.GetAnyAttributeNode;
 import com.oracle.graal.python.nodes.call.PythonCallNodeGen.GetCallAttributeNodeGen;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
-import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.ReadGlobalOrBuiltinNode;
 import com.oracle.graal.python.nodes.frame.ReadNameNode;
@@ -232,10 +232,9 @@ protected static Node createInvoke() {
     Object call(VirtualFrame frame, ForeignInvoke callable,
                     @Cached("create()") PForeignToPTypeNode fromForeign,
                     @Cached("create()") BranchProfile keywordsError,
-                    @Cached("create()") BranchProfile nameError,
                     @Cached("create()") BranchProfile typeError,
                     @Cached("create()") BranchProfile invokeError,
-                    @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode getAttrNode,
+                    @Cached("create()") GetAnyAttributeNode getAttrNode,
                     @Cached("createInvoke()") Node invokeNode) {
         Object[] arguments = evaluateArguments(frame);
         PKeyword[] keywords = evaluateKeywords(frame);
@@ -245,13 +244,10 @@ Object call(VirtualFrame frame, ForeignInvoke callable,
         }
         try {
             return fromForeign.executeConvert(ForeignAccess.sendInvoke(invokeNode, callable.receiver, callable.identifier, arguments));
-        } catch (UnknownIdentifierException e) {
-            nameError.enter();
-            throw raise(PythonErrorType.NameError, e);
         } catch (ArityException | UnsupportedTypeException e) {
             typeError.enter();
             throw raise(PythonErrorType.TypeError, e);
-        } catch (UnsupportedMessageException e) {
+        } catch (UnknownIdentifierException | UnsupportedMessageException e) {
             invokeError.enter();
             // the interop contract is to revert to READ and then EXECUTE
             Object member = getAttrNode.executeObject(callable.receiver, callable.identifier);