intrinsified PyMethodDescr

Author: tomasstupka

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

@@ -46,6 +46,9 @@ def _reference_classmethod(args):
         return classmethod(args[0])()
     raise TypeError
 
+def _reference_method_descr(args):
+    return 1 if isinstance(args[0], type(list.append)) else 0
+
 class TestDescrObject(object):
 
     def test_new_classmethod(self):
@@ -340,3 +343,16 @@ def compile_module(self, name):
         callfunction="wrap_PyDescr_NewClassMethod",
         cmpfunc=unhandled_error_compare
     )
+
+    test_PyMethodDescr_Check = CPyExtFunction(
+        _reference_method_descr,
+        lambda: (
+            (tuple.__add__,),
+            (lambda x: x,),
+            (_reference_method_descr,),
+        ),        
+        resultspec="i",
+        argspec="O",
+        arguments=["PyObject* func"],
+        cmpfunc=unhandled_error_compare
+    )

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -122,6 +122,7 @@
 import com.oracle.graal.python.builtins.modules.cext.PythonCextMemoryViewBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextAbstractBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextErrBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextDescrBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextIterBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextNamespaceBuiltins;
@@ -492,6 +493,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
                         new PythonCextCEvalBuiltins(),
                         new PythonCextCodeBuiltins(),
                         new PythonCextComplexBuiltins(),
+                        new PythonCextDescrBuiltins(),
                         new PythonCextDictBuiltins(),
                         new PythonCextErrBuiltins(),
                         new PythonCextFileBuiltins(),

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

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2021, 2022, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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.
+ */
+package com.oracle.graal.python.builtins.modules.cext;
+
+
+import java.util.List;
+import com.oracle.graal.python.builtins.Builtin;
+import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.Python3Core;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.modules.BuiltinFunctions.IsInstanceNode;
+import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+
+@CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
+@GenerateNodeFactory
+public final class PythonCextDescrBuiltins extends PythonBuiltins {
+
+    @Override
+    protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
+        return PythonCextDescrBuiltinsFactory.getFactories();
+    }
+
+    @Override
+    public void initialize(Python3Core core) {
+        super.initialize(core);
+    }
+
+//def PyMethodDescr_Check(func):
+//    return 1 if isinstance(func, type(list.append)) else 0    
+    
+    @Builtin(name = "PyMethodDescr_Check", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    public abstract static class PyMethodDescrCheckNode extends PythonUnaryBuiltinNode {
+
+        @SuppressWarnings("unused")
+        @Specialization
+        int check(VirtualFrame frame, Object func,
+                @Cached IsInstanceNode isInstanceNode) {
+            return isInstanceNode.executeWith(frame, func, PythonBuiltinClassType.PBuiltinFunction) ? 1 : 0;
+        }
+    }
+
+    
+}

graalpython/lib-graalpython/python_cext.py

@@ -53,14 +53,6 @@ def decorator(fun):
             return make_may_raise_wrapper(fun, error_result)
         return decorator
 
-def METH_UNSUPPORTED():
-    raise NotImplementedError("unsupported message type")
-
-
-def PyMethodDescr_Check(func):
-    return 1 if isinstance(func, type(list.append)) else 0
-
-
 # corresponds to PyInstanceMethod_Type
 class instancemethod:
     def __init__(self, func):