[GR-14445] Support constructing and calling methods with non-function callables

PullRequest: graalpython/443

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_methods.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
@@ -70,3 +70,22 @@ def test_call_builtin_method():
 def test_call_builtin_unbound_method():
     x = {1: 2}
     assert dict.__getitem__.__call__(x, 1) == 2
+
+
+def test_make_method():
+    method_type = type(X().foo)
+
+    class A():
+        def __init__(self, *args):
+            pass
+
+        def __call__(self, x, y):
+            assert isinstance(x, str)
+            assert isinstance(self, A)
+            return "A" + str(x) + str(y)
+
+    method1 = method_type(A, A)
+    method2 = method_type(A(), " is ")
+
+    assert isinstance(method1(), A)
+    assert method2(1) == "A is 1", method2(1)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -140,6 +140,7 @@
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.control.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
+import com.oracle.graal.python.nodes.datamodel.IsCallableNode;
 import com.oracle.graal.python.nodes.datamodel.IsIndexNode;
 import com.oracle.graal.python.nodes.datamodel.IsSequenceNode;
 import com.oracle.graal.python.nodes.expression.CastToListNode;
@@ -2378,13 +2379,23 @@ public Object generator(Object args, Object kwargs) {
     @GenerateNodeFactory
     public abstract static class MethodTypeNode extends PythonTernaryBuiltinNode {
         @Specialization
-        Object method(LazyPythonClass cls, Object self, PFunction func) {
+        Object method(LazyPythonClass cls, PFunction func, Object self) {
             return factory().createMethod(cls, self, func);
         }
 
-        @Specialization(guards = "isPythonBuiltinClass(cls)")
-        Object methodGeneric(@SuppressWarnings("unused") LazyPythonClass cls, Object self, PBuiltinFunction func) {
-            return factory().createBuiltinMethod(self, func);
+        @Specialization
+        Object methodBuiltin(@SuppressWarnings("unused") LazyPythonClass cls, PBuiltinFunction func, Object self) {
+            return factory().createMethod(self, func);
+        }
+
+        @Specialization
+        Object methodGeneric(@SuppressWarnings("unused") LazyPythonClass cls, Object func, Object self,
+                        @Cached("create()") IsCallableNode isCallable) {
+            if (isCallable.execute(func)) {
+                return factory().createMethod(self, func);
+            } else {
+                throw raise(TypeError, "first argument must be callable");
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/ManagedMethodWrappersMR.java

@@ -60,7 +60,6 @@
 import com.oracle.truffle.api.interop.Resolve;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.PrimitiveValueProfile;
 
 @MessageResolution(receiverType = MethodWrapper.class)
 public class ManagedMethodWrappersMR {
@@ -76,8 +75,6 @@ abstract static class ExecuteNode extends Node {
         @Child private ExecuteKeywordStarargsNode expandKwargsNode = ExecuteKeywordStarargsNode.create();
         @Child private CallNode dispatch;
 
-        private final PrimitiveValueProfile starArgsLenProfile = PrimitiveValueProfile.createEqualityProfile();
-
         public Object access(MethKeywords object, Object[] arguments) {
             if (arguments.length != 3) {
                 throw ArityException.raise(3, arguments.length);
@@ -90,8 +87,7 @@ public Object access(MethKeywords object, Object[] arguments) {
             Object kwArgs = toJavaNode.execute(arguments[2]);
 
             Object[] starArgsArray = posStarargsNode.executeWith(starArgs);
-            int starArgsLen = starArgsLenProfile.profile(starArgsArray.length);
-            Object[] pArgs = PositionalArgumentsNode.prependArgument(receiver, starArgsArray, starArgsLen);
+            Object[] pArgs = PositionalArgumentsNode.prependArgument(receiver, starArgsArray);
             PKeyword[] kwArgsArray = expandKwargsNode.executeWith(kwArgs);
 
             // execute

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/method/AbstractMethodBuiltins.java

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.nodes.argument.positional.PositionalArgumentsNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
@@ -73,16 +74,26 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public abstract static class CallNode extends PythonVarargsBuiltinNode {
         @Child private com.oracle.graal.python.nodes.call.CallNode callNode = com.oracle.graal.python.nodes.call.CallNode.create();
 
-        @Specialization
+        @Specialization(guards = "isFunction(self.getFunction())")
         protected Object doIt(VirtualFrame frame, PMethod self, Object[] arguments, PKeyword[] keywords) {
             return callNode.execute(frame, self, arguments, keywords);
         }
 
-        @Specialization
+        @Specialization(guards = "isFunction(self.getFunction())")
         protected Object doIt(VirtualFrame frame, PBuiltinMethod self, Object[] arguments, PKeyword[] keywords) {
             return callNode.execute(frame, self, arguments, keywords);
         }
 
+        @Specialization(guards = "!isFunction(self.getFunction())")
+        protected Object doItNonFunction(VirtualFrame frame, PMethod self, Object[] arguments, PKeyword[] keywords) {
+            return callNode.execute(frame, self.getFunction(), PositionalArgumentsNode.prependArgument(self.getSelf(), arguments), keywords);
+        }
+
+        @Specialization(guards = "!isFunction(self.getFunction())")
+        protected Object doItNonFunction(VirtualFrame frame, PBuiltinMethod self, Object[] arguments, PKeyword[] keywords) {
+            return callNode.execute(frame, self.getFunction(), PositionalArgumentsNode.prependArgument(self.getSelf(), arguments), keywords);
+        }
+
         @Override
         public Object varArgExecute(VirtualFrame frame, Object[] arguments, PKeyword[] keywords) throws VarargsBuiltinDirectInvocationNotSupported {
             Object[] argsWithoutSelf = new Object[arguments.length - 1];

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -255,7 +255,7 @@ private Object op(VirtualFrame frame, PythonAbstractClass self, Object[] argumen
             Object newMethod = lookupNew.execute(self);
             if (newMethod != PNone.NO_VALUE) {
                 CompilerAsserts.partialEvaluationConstant(doCreateArgs);
-                Object[] newArgs = doCreateArgs ? PositionalArgumentsNode.prependArgument(self, arguments, arguments.length) : arguments;
+                Object[] newArgs = doCreateArgs ? PositionalArgumentsNode.prependArgument(self, arguments) : arguments;
                 Object newInstance = dispatchNew.execute(frame, newMethod, newArgs, keywords);
                 PythonAbstractClass newInstanceKlass = getClass.execute(newInstance);
                 if (isSameType(newInstanceKlass, self)) {
@@ -268,7 +268,7 @@ private Object op(VirtualFrame frame, PythonAbstractClass self, Object[] argumen
                         if (initMethod != PNone.NO_VALUE) {
                             Object[] initArgs;
                             if (doCreateArgs) {
-                                initArgs = PositionalArgumentsNode.prependArgument(newInstance, arguments, arguments.length);
+                                initArgs = PositionalArgumentsNode.prependArgument(newInstance, arguments);
                             } else {
                                 // XXX: (tfel) is this valid? I think it should be fine...
                                 arguments[0] = newInstance;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/positional/PositionalArgumentsNode.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.
@@ -63,10 +63,10 @@ public Object[] execute(VirtualFrame frame) {
         return values;
     }
 
-    public static Object[] prependArgument(Object primary, Object[] arguments, int argumentsLength) {
-        Object[] result = new Object[argumentsLength + 1];
+    public static Object[] prependArgument(Object primary, Object[] arguments) {
+        Object[] result = new Object[arguments.length + 1];
         result[0] = primary;
-        System.arraycopy(arguments, 0, result, 1, argumentsLength);
+        System.arraycopy(arguments, 0, result, 1, arguments.length);
         return result;
     }
 

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

@@ -88,7 +88,7 @@ protected Object specialCall(VirtualFrame frame, Object callableObject, Object[]
             CompilerDirectives.transferToInterpreter();
             throw raise(PythonBuiltinClassType.TypeError, "'%p' object is not callable", callableObject);
         }
-        return callCallNode.execute(frame, call, PositionalArgumentsNode.prependArgument(callableObject, arguments, arguments.length), keywords);
+        return callCallNode.execute(frame, call, PositionalArgumentsNode.prependArgument(callableObject, arguments), keywords);
     }
 
     private CreateArgumentsNode ensureCreateArguments() {

mx.graalpython/mx_graalpython_benchmark.py

@@ -220,9 +220,9 @@ def run(self, cwd, args):
             dists.append('SULONG')
             if mx.suite("sulong-managed", fatalIfMissing=False):
                 dists.append('SULONG_MANAGED')
-                extra_polyglot_args += [mx_subst.path_substitutions.substitute('--llvm.libraryPath=<path:SULONG_MANAGED_LIBS>')]
+                extra_polyglot_args += ["--experimental-options", mx_subst.path_substitutions.substitute('--llvm.libraryPath=<path:SULONG_MANAGED_LIBS>')]
             else:
-                extra_polyglot_args += [mx_subst.path_substitutions.substitute('--llvm.libraryPath=<path:SULONG_LIBS>')]
+                extra_polyglot_args += ["--experimental-options", mx_subst.path_substitutions.substitute('--llvm.libraryPath=<path:SULONG_LIBS>')]
 
 
         vm_args = mx.get_runtime_jvm_args(dists, cp_suffix=self._cp_suffix, cp_prefix=self._cp_prefix)