Intrinsify PyMethod_New

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_method.py

@@ -36,8 +36,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+import types
 
-from . import CPyExtType
+from . import CPyExtType, CPyExtTestCase, unhandled_error_compare, CPyExtFunction
 
 __dir__ = __file__.rpartition("/")[0]
 
@@ -101,3 +102,20 @@ def test_methods(self):
         assert obj.meth_static_noargs() == (None, None)
         assert obj.meth_static_varargs(1, 2, 3) == (None, (1, 2, 3))
         assert obj.meth_static_varargs_keywords(1, 2, 3, a=1, b=2) == (None, (1, 2, 3), {'a': 1, 'b': 2})
+
+
+class TestPyMethod(CPyExtTestCase):
+    def compile_module(self, name):
+        type(self).mro()[1].__dict__["test_%s" % name].create_module(name)
+        super().compile_module(name)
+
+    test_PyMethod_New = CPyExtFunction(
+        lambda args: types.MethodType(*args),
+        lambda: (
+            (list.append, 6),
+        ),
+        resultspec="O",
+        argspec='OO',
+        arguments=["PyObject* func", "PyObject* self"],
+        cmpfunc=unhandled_error_compare
+    )

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

@@ -3883,4 +3883,15 @@ Object tssDelete(Object key,
             return PNone.NONE;
         }
     }
+
+    @Builtin(name = "PyMethod_New", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class PyMethodNew extends PythonBinaryBuiltinNode {
+        @Specialization
+        Object methodNew(Object func, Object self) {
+            // Note: CPython also constructs the object directly, without running the constructor or
+            // checking the inputs
+            return factory().createMethod(self, func);
+        }
+    }
 }

graalpython/lib-graalpython/python_cext.py

@@ -105,14 +105,6 @@ def METH_UNSUPPORTED():
     raise NotImplementedError("unsupported message type")
 
 
-def PyMethod_New(func, self):
-    # TODO we should use the method constructor
-    # e.g. methodtype(func, self)
-    def bound_function(*args, **kwargs):
-        return func(self, *args, **kwargs)
-    return bound_function
-
-
 def PyMethodDescr_Check(func):
     return 1 if isinstance(func, type(list.append)) else 0