Fix super(type, foreign) to lookup foreign members

Author: eregon

docs/user/Interoperability.md

@@ -89,6 +89,20 @@ h |= {3: 6} # {1: 2, 3: 6}
 h == {1: 2, 3: 6} # True
 ```
 
+In case of a method defined both in Python and on the foreign object, the Python method wins.
+To call the foreign method instead, use `super(type_owning_the_python_method, foreign_object).method(*args)`:
+
+```python
+from java.util import ArrayList
+l = ArrayList()
+l.extend([5, 6, 7])
+l.remove(7) # Python list.remove
+assert l == [5, 6]
+
+super(list, l).remove(0) # ArrayList#remove(int index)
+assert l == [6]
+```
+
 See [this section](#interop-types-to-python) for more interop traits and how they map to Python types.
 
 ## Interacting with other dynamic languages from Python scripts

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

@@ -701,6 +701,16 @@ def getLevel(self):
         my_lr2 = MyLogRecord(Level.FINEST, message)
         assert my_lr2.getLevel() == Level.WARNING
 
+    def test_super(self):
+        from java.util import ArrayList
+        l = ArrayList()
+        l.extend([5, 6, 7])
+        l.remove(7) # Python list.remove
+        assert l == [5, 6]
+
+        super(list, l).remove(0) # ArrayList#remove(int index)
+        assert l == [6]
+
     def test_java_array(self):
         import java
         il = java.type("int[]")(20)

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

@@ -280,8 +280,8 @@ private static String asJavaPrefixedMethod(String prefix, String member) {
     @GenerateInline
     @GenerateCached(false)
     @ImportStatic(PythonOptions.class)
-    abstract static class ForeignGetattrNode extends Node {
-        abstract Object execute(Node inliningTarget, Object object, Object name);
+    public abstract static class ForeignGetattrNode extends Node {
+        public abstract Object execute(Node inliningTarget, Object object, Object name);
 
         @Specialization
         static Object doIt(Node inliningTarget, Object object, Object memberObj,
@@ -292,7 +292,13 @@ static Object doIt(Node inliningTarget, Object object, Object memberObj,
                         @Cached PRaiseNode.Lazy raiseNode) {
             gil.release(true);
             try {
-                String member = castToString.execute(memberObj);
+                String member;
+                try {
+                    member = castToString.execute(memberObj);
+                } catch (CannotCastException e) {
+                    throw raiseNode.get(inliningTarget).raise(TypeError, ErrorMessages.ATTR_NAME_MUST_BE_STRING, memberObj);
+                }
+
                 if (read.isMemberReadable(object, member)) {
                     return toPythonNode.executeConvert(read.readMember(object, member));
                 } else if (PythonLanguage.get(inliningTarget).getEngineOption(PythonOptions.EmulateJython)) {
@@ -308,13 +314,11 @@ static Object doIt(Node inliningTarget, Object object, Object memberObj,
                         }
                     }
                 }
-            } catch (CannotCastException e) {
-                throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.ATTR_NAME_MUST_BE_STRING, memberObj);
             } catch (UnknownIdentifierException | UnsupportedMessageException | ArityException ignore) {
             } finally {
                 gil.acquire();
             }
-            throw raiseNode.get(inliningTarget).raise(PythonErrorType.AttributeError, ErrorMessages.FOREIGN_OBJ_HAS_NO_ATTR_S, memberObj);
+            throw raiseNode.get(inliningTarget).raise(AttributeError, ErrorMessages.FOREIGN_OBJ_HAS_NO_ATTR_S, memberObj);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/superobject/SuperBuiltins.java

@@ -60,6 +60,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cell.CellBuiltins;
 import com.oracle.graal.python.builtins.objects.cell.PCell;
+import com.oracle.graal.python.builtins.objects.foreign.ForeignObjectBuiltins.ForeignGetattrNode;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
@@ -95,6 +96,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.object.IsForeignObjectNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
@@ -423,7 +425,7 @@ public abstract static class GetattributeNode extends GetAttrBuiltinNode {
         @Child private ReadAttributeFromObjectNode readFromDict = ReadAttributeFromObjectNode.createForceType();
         @Child private CallSlotDescrGet callGetSlotNode;
         @Child private GetTypeNode getType;
-        @Child private GetObjectNode getObject;
+        @Child private GetObjectNode getObject = GetObjectNodeGen.create();
         @Child private ObjectBuiltins.GetAttributeNode objectGetattributeNode;
         @Child private GetMroNode getMroNode;
         @Child private IsSameTypeNode isSameTypeNode;
@@ -444,7 +446,9 @@ Object get(VirtualFrame frame, SuperObject self, Object attr,
                         @Cached GetObjectTypeNode getObjectType,
                         @Cached CastToTruffleStringCheckedNode castToTruffleStringNode,
                         @Cached InlinedConditionProfile hasDescrGetProfile,
-                        @Cached InlinedConditionProfile getObjectIsStartObjectProfile) {
+                        @Cached InlinedConditionProfile getObjectIsStartObjectProfile,
+                        @Cached IsForeignObjectNode isForeignObjectNode,
+                        @Cached ForeignGetattrNode foreignGetattrNode) {
             Object startType = getObjectType.execute(inliningTarget, self);
             if (startType == null) {
                 return genericGetAttr(frame, self, attr);
@@ -465,12 +469,13 @@ Object get(VirtualFrame frame, SuperObject self, Object attr,
                 getType = insert(GetTypeNodeGen.create());
             }
 
+            Object type = getType.executeCached(self);
             PythonAbstractClass[] mro = getMro(startType);
             /* No need to check the last one: it's gonna be skipped anyway. */
             int i = 0;
             int n = mro.length;
             for (i = 0; i + 1 < n; i++) {
-                if (isSameType(getType.executeCached(self), mro[i])) {
+                if (isSameType(type, mro[i])) {
                     break;
                 }
             }
@@ -493,22 +498,28 @@ Object get(VirtualFrame frame, SuperObject self, Object attr,
                             CompilerDirectives.transferToInterpreterAndInvalidate();
                             callGetSlotNode = insert(CallSlotDescrGet.create());
                         }
-                        if (getObject == null) {
-                            CompilerDirectives.transferToInterpreterAndInvalidate();
-                            getObject = insert(GetObjectNodeGen.create());
-                        }
+                        Object object = getObject.executeCached(self);
                         Object obj;
-                        if (getObjectIsStartObjectProfile.profile(inliningTarget, getObject.executeCached(self) == startType)) {
+                        if (getObjectIsStartObjectProfile.profile(inliningTarget, object == startType)) {
                             obj = PNone.NO_VALUE;
                         } else {
-                            obj = self.getObject();
+                            obj = object;
                         }
                         res = callGetSlotNode.executeCached(frame, resSlots.tp_descr_get(), res, obj, startType);
                     }
                     return res;
                 }
             }
 
+            Object object = getObject.executeCached(self);
+            if (isForeignObjectNode.execute(inliningTarget, object)) {
+                try {
+                    return foreignGetattrNode.execute(inliningTarget, object, stringAttr);
+                } catch (PException e) {
+                    // continue to genericGetAttr()
+                }
+            }
+
             return genericGetAttr(frame, self, stringAttr);
         }