intrinsified PyFunc

Author: tomasstupka

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

@@ -72,9 +72,9 @@ def compile_module(self, name):
         type,
         lambda: ([], 12, sys.modules)
     )
-
+        
     # Below are the PyObject_* identifiers that we know are used in numpy
-
+    
     def is_buffer(x):
         __breakpoint__()
         if (isinstance(x, bytes) or isinstance(x, bytearray) or isinstance(x, array.array)):
@@ -459,3 +459,14 @@ def _ref_hash_not_implemented(args):
     # )
     # test_PyObject_Init = CPyExtFunction(
     # )
+
+    test_PyStaticMethod_New = CPyExtFunction(
+        lambda args: None,
+        lambda: (
+            (kw_fun,),
+        ),
+        resultspec="O",
+        arguments=["PyObject* func"],
+        argspec="O",
+        cmpfunc=lambda x, y: type(x) == staticmethod
+    )

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

@@ -123,6 +123,7 @@
 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.PythonCextFuncBuiltins;
 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;
@@ -498,6 +499,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
                         new PythonCextErrBuiltins(),
                         new PythonCextFileBuiltins(),
                         new PythonCextFloatBuiltins(),
+                        new PythonCextFuncBuiltins(),
                         new PythonCextImportBuiltins(),
                         new PythonCextIterBuiltins(),
                         new PythonCextListBuiltins(),

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 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 com.oracle.graal.python.builtins.Builtin;
+import java.util.List;
+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.objects.method.PDecoratedMethod;
+import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.Specialization;
+
+@CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
+@GenerateNodeFactory
+public final class PythonCextFuncBuiltins extends PythonBuiltins {
+
+    @Override
+    protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
+        return PythonCextFuncBuiltinsFactory.getFactories();
+    }
+
+    @Override
+    public void initialize(Python3Core core) {
+        super.initialize(core);
+    }
+
+    @Builtin(name = "PyStaticMethod_New", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    public abstract static class PyStaticMethodNewNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        public Object staticmethod(Object func) {
+            PDecoratedMethod res = factory().createStaticmethod(PythonBuiltinClassType.PStaticmethod);
+            res.setCallable(func);
+            return res;
+        }
+    }
+}

graalpython/lib-graalpython/python_cext.py

@@ -85,11 +85,6 @@ def __repr__(self):
 def PyInstanceMethod_New(func):
     return instancemethod(func)
 
-
-@may_raise
-def PyStaticMethod_New(func):
-    return staticmethod(func)
-
 @may_raise
 def dict_from_list(lst):
     if len(lst) % 2 != 0: