[GR-31698] Add support for calling managed class tp_init from native

qunaibit · qunaibit · commit 9eb3f7e65b6b · 2021-05-30T06:41:52.000Z
PullRequest: graalpython/1817
diff --git a/graalpython/com.oracle.graal.python.cext/setup.py b/graalpython/com.oracle.graal.python.cext/setup.py
@@ -58,13 +58,14 @@
 libhpy_name = "libhpy"
 libposix_name = "libposix"
 
+MACOS = sys.platform == "darwin"
 verbosity = '--verbose' if sys.flags.verbose else '--quiet'
-darwin_native = sys.platform == "darwin" and __graalpython__.platform_id == "native"
+darwin_native = MACOS and __graalpython__.platform_id == "native"
 relative_rpath = "@loader_path" if darwin_native else r"$ORIGIN"
 so_ext = get_config_var("EXT_SUFFIX")
 SOABI = get_config_var("SOABI")
 is_managed = 'managed' in SOABI
-lib_ext = 'dylib' if sys.platform == "darwin" else 'so'
+lib_ext = 'dylib' if MACOS else 'so'
 
 # configure logger
 logger = logging.getLogger(__name__)
@@ -361,6 +362,8 @@ def __init__(self, name, subdir="modules", files=None, deps=[], **kwargs):
         # common case: just a single file which is the module's name plus the file extension
         if not files:
             self.files = [name + ".c"]
+        else:
+            self.files = files
         self.kwargs = kwargs
 
     def __call__(self):
diff --git a/graalpython/com.oracle.graal.python.cext/src/typeobject.c b/graalpython/com.oracle.graal.python.cext/src/typeobject.c
@@ -486,8 +486,8 @@ int PyType_Ready(PyTypeObject* cls) {
         } else {
             bases = PyTuple_Pack(1, base);
         }
+        cls->tp_bases = bases;
     }
-    cls->tp_bases = bases;
 
     /* Initialize tp_dict */
     PyObject* dict = cls->tp_dict;
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py b/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py
@@ -204,6 +204,32 @@ def test_new(self):
         tester = TestNew()
         assert tester.get_none() is None
 
+    def test_init(self):
+        TestInit = CPyExtType("TestInit", 
+                             '''static PyObject* testnew_new(PyTypeObject* cls, PyObject* a, PyObject* b) {
+                                 PyObject* obj;
+                                 TestInitObject* typedObj;
+                                 obj = PyBaseObject_Type.tp_new(cls, a, b);
+
+                                 typedObj = ((TestInitObject*)obj);
+                                 typedObj->dict = (PyDictObject*) PyDict_Type.tp_new(&PyDict_Type, a, b);
+                                 PyDict_Type.tp_init((PyObject*) typedObj->dict, a, b);
+                                 PyDict_SetItemString((PyObject*) typedObj->dict, "test", PyLong_FromLong(42));
+                                 
+                                 Py_XINCREF(obj);
+                                 return obj;
+                            }
+                            static PyObject* get_dict_item(PyObject* self) {
+                                return PyDict_GetItemString((PyObject*) ((TestInitObject*)self)->dict, "test");
+                            }
+                             ''',
+                             cmembers="PyDictObject *dict;",
+                             tp_new="testnew_new",
+                             tp_methods='{"get_dict_item", (PyCFunction)get_dict_item, METH_NOARGS, ""}'
+                             )
+        tester = TestInit()
+        assert tester.get_dict_item() == 42
+
     def test_slots(self):
         TestSlots = CPyExtType("TestSlots", 
                                '''
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/AtexitModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/AtexitModuleBuiltins.java
@@ -136,7 +136,7 @@ private static void handleException(PythonContext context, PException e) {
         @Specialization
         Object register(Object callable, Object[] arguments, PKeyword[] keywords) {
             CompilerDirectives.transferToInterpreter();
-            RootCallTarget callTarget = PythonLanguage.getCurrent().createCachedCallTarget(l -> new AtExitRootNode(l), AtExitRootNode.class);
+            RootCallTarget callTarget = PythonLanguage.getCurrent().createCachedCallTarget(AtExitRootNode::new, AtExitRootNode.class);
             getContext().registerAtexitHook(callable, arguments, keywords, callTarget);
             return callable;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java
@@ -694,7 +694,7 @@ public long hashWithState(ThreadState state,
                     @Exclusive @Cached CastUnsignedToJavaLongHashNode castUnsignedToJavaLongHashNode) {
         Object hashMethod = lib.lookupAttributeOnType(this, __HASH__);
         if (!methodLib.isCallable(hashMethod) && lookupGet.execute(hashMethod, __GET__) == PNone.NO_VALUE) {
-            throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE, this);
+            throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE_P, this);
         }
         Object result = methodLib.callUnboundMethodIgnoreGetExceptionWithState(hashMethod, state, this);
         // see PyObject_GetHash and slot_tp_hash in CPython. The result of the
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java
@@ -495,10 +495,9 @@ public PythonAbstractNativeObject getPythonNativeObject(TruffleObject nativePtr,
         if (newRefProfile.profile(id == 0)) {
             return createPythonAbstractNativeObject(nativePtr, addRefCntNode, steal, attachLLVMTypeNode);
         } else if (validRefProfile.profile(id > 0)) {
-            PythonAbstractNativeObject nativeObject;
             ref = lookupNativeObjectReference(id);
             if (ref != null) {
-                nativeObject = ref.get();
+                PythonAbstractNativeObject nativeObject = ref.get();
                 if (resurrectProfile.profile(nativeObject == null)) {
                     // Bad luck: the mapping is still there and wasn't cleaned up but we need a new
                     // mapping. Therefore, we need to cancel the cleaner action and set a new native
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java
@@ -67,6 +67,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.RICHCMP;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__HASH__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEXT__;
@@ -534,6 +535,13 @@ static Object doTpNew(PythonManagedClass object, @SuppressWarnings("unused") Pyt
             return ManagedMethodWrappers.createKeywords(newFunction, callGetNewfuncTypeidNode.call(NativeCAPISymbol.FUN_GET_NEWFUNC_TYPE_ID));
         }
 
+        @Specialization(guards = "eq(TP_INIT, key)")
+        static Object doTpInit(PythonManagedClass object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
+                        @Cached LookupAttributeInMRONode.Dynamic getAttrNode) {
+            Object initFun = getAttrNode.execute(object, __INIT__);
+            return PyProcsWrapper.createInitWrapper(initFun);
+        }
+
         @Specialization(guards = "eq(TP_HASH, key)")
         static Object doTpHash(PythonManagedClass object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
                         @Cached LookupAttributeInMRONode.Dynamic getHashNode,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeMember.java
@@ -97,6 +97,7 @@ public enum NativeMember {
     TP_SETATTRO("tp_setattro"),
     TP_ITERNEXT("tp_iternext"),
     TP_NEW("tp_new"),
+    TP_INIT("tp_init"),
     TP_DICT("tp_dict", OBJECT),
     TP_STR("tp_str"),
     TP_REPR("tp_repr"),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java
@@ -49,14 +49,20 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PAsPointerNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.ToPyObjectNode;
+import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.nodes.argument.keywords.ExpandKeywordStarargsNode;
+import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
+import com.oracle.graal.python.nodes.argument.positional.PositionalArgumentsNode;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
+import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -196,6 +202,57 @@ protected int execute(Object[] arguments,
 
     }
 
+    @ExportLibrary(InteropLibrary.class)
+    static class InitWrapper extends PyProcsWrapper {
+
+        public InitWrapper(Object delegate) {
+            super(delegate);
+        }
+
+        @ExportMessage(name = "execute")
+        static class Execute {
+
+            @Specialization(guards = "arguments.length == 3")
+            static int init(InitWrapper self, Object[] arguments,
+                            @CachedLibrary("self") PythonNativeWrapperLibrary lib,
+                            @Cached ExecutePositionalStarargsNode.ExecutePositionalStarargsInteropNode posStarargsNode,
+                            @Cached ExpandKeywordStarargsNode expandKwargsNode,
+                            @Cached CallVarargsMethodNode callNode,
+                            @Cached ToJavaNode toJavaNode,
+                            @Cached BranchProfile errorProfile,
+                            @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
+                            @Exclusive @Cached GilNode gil) {
+                boolean mustRelease = gil.acquire();
+                try {
+                    try {
+                        // convert args
+                        Object receiver = toJavaNode.execute(arguments[0]);
+                        Object starArgs = toJavaNode.execute(arguments[1]);
+                        Object kwArgs = toJavaNode.execute(arguments[2]);
+
+                        Object[] starArgsArray = posStarargsNode.executeWithGlobalState(starArgs);
+                        Object[] pArgs = PositionalArgumentsNode.prependArgument(receiver, starArgsArray);
+                        PKeyword[] kwArgsArray = expandKwargsNode.execute(kwArgs);
+                        callNode.execute(null, lib.getDelegate(self), pArgs, kwArgsArray);
+                        return 0;
+                    } catch (PException e) {
+                        errorProfile.enter();
+                        transformExceptionToNativeNode.execute(null, e);
+                        return -1;
+                    }
+                } finally {
+                    gil.release(mustRelease);
+                }
+            }
+
+            @Specialization(guards = "arguments.length != 3")
+            static int error(@SuppressWarnings("unused") InitWrapper self, Object[] arguments) throws ArityException {
+                throw ArityException.create(3, 3, arguments.length);
+            }
+
+        }
+    }
+
     @ExportLibrary(InteropLibrary.class)
     static class SsizeargfuncWrapper extends PyProcsWrapper {
 
@@ -245,6 +302,10 @@ public static SetAttrWrapper createSetAttrWrapper(Object setAttrMethod) {
         return new SetAttrWrapper(setAttrMethod);
     }
 
+    public static InitWrapper createInitWrapper(Object setInitMethod) {
+        return new InitWrapper(setInitMethod);
+    }
+
     public static SsizeargfuncWrapper createSsizeargfuncWrapper(Object ssizeArgMethod, boolean newRef) {
         return new SsizeargfuncWrapper(ssizeArgMethod, newRef);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/SliceBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/SliceBuiltins.java
@@ -221,7 +221,7 @@ public abstract static class HashNode extends PythonBuiltinNode {
         public static long hash(PSlice self,
                         @Cached PRaiseNode raise) {
             CompilerDirectives.transferToInterpreter();
-            throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE, PythonBuiltinClassType.PSlice);
+            throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE_P, PythonBuiltinClassType.PSlice);
         }
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java
@@ -592,7 +592,8 @@ public abstract class ErrorMessages {
     public static final String UNAVAILABLE_ON_THIS_PLATFORM = "%s: %s unavailable on this platform";
     public static final String UNAVAILABLE_ON_THIS_PLATFORM_NO_FUNC = "%s unavailable on this platform";
     public static final String UNEXPECTED_KEYWORD_ARGS = "%s: unexpected keyword arguments";
-    public static final String UNHASHABLE_TYPE = "unhashable type: '%p'";
+    public static final String UNHASHABLE_TYPE_P = "unhashable type: '%p'";
+    public static final String UNHASHABLE_TYPE = "unhashable type";
     public static final String UNINITIALIZED_S_OBJECT = "uninitialized classmethod object";
     public static final String UNKNOWN_ADDR_FAMILY = "unknown address family %d";
     public static final String UNKNOWN_ATTR = "Unknown attribute: '%s'";

Original file line number	Diff line number	Diff line change
`@@ -486,8 +486,8 @@ int PyType_Ready(PyTypeObject* cls) {`
`486`	`486`	`} else {`
`487`	`487`	`bases = PyTuple_Pack(1, base);`
`488`	`488`	`}`
	`489`	`+ cls->tp_bases = bases;`
`489`	`490`	`}`
`490`		`- cls->tp_bases = bases;`
`491`	`491`
`492`	`492`	`/* Initialize tp_dict */`
`493`	`493`	`PyObject* dict = cls->tp_dict;`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private static void handleException(PythonContext context, PException e) {`
`136`	`136`	`@Specialization`
`137`	`137`	`Object register(Object callable, Object[] arguments, PKeyword[] keywords) {`
`138`	`138`	`CompilerDirectives.transferToInterpreter();`
`139`		`- RootCallTarget callTarget = PythonLanguage.getCurrent().createCachedCallTarget(l -> new AtExitRootNode(l), AtExitRootNode.class);`
	`139`	`+ RootCallTarget callTarget = PythonLanguage.getCurrent().createCachedCallTarget(AtExitRootNode::new, AtExitRootNode.class);`
`140`	`140`	`getContext().registerAtexitHook(callable, arguments, keywords, callTarget);`
`141`	`141`	`return callable;`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ public long hashWithState(ThreadState state,`
`694`	`694`	`@Exclusive @Cached CastUnsignedToJavaLongHashNode castUnsignedToJavaLongHashNode) {`
`695`	`695`	`Object hashMethod = lib.lookupAttributeOnType(this, __HASH__);`
`696`	`696`	`if (!methodLib.isCallable(hashMethod) && lookupGet.execute(hashMethod, __GET__) == PNone.NO_VALUE) {`
`697`		`- throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE, this);`
	`697`	`+ throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE_P, this);`
`698`	`698`	`}`
`699`	`699`	`Object result = methodLib.callUnboundMethodIgnoreGetExceptionWithState(hashMethod, state, this);`
`700`	`700`	`// see PyObject_GetHash and slot_tp_hash in CPython. The result of the`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public abstract static class HashNode extends PythonBuiltinNode {`
`221`	`221`	`public static long hash(PSlice self,`
`222`	`222`	`@Cached PRaiseNode raise) {`
`223`	`223`	`CompilerDirectives.transferToInterpreter();`
`224`		`- throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE, PythonBuiltinClassType.PSlice);`
	`224`	`+ throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.UNHASHABLE_TYPE_P, PythonBuiltinClassType.PSlice);`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`