[GR-47071] Support lazy type initalization during subclass creation

PullRequest: graalpython/2861

Author: qunaibit

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -1350,6 +1350,12 @@ PyAPI_FUNC(void) truffle_set_tp_flags(PyTypeObject* type, unsigned long flags) {
     type->tp_flags = flags;
 }
 
+PyAPI_FUNC(void) truffle_check_type_ready(PyTypeObject* type) {
+    if (!(type->tp_flags & Py_TPFLAGS_READY)) {
+        PyType_Ready(type);
+    }
+}
+
 PyAPI_FUNC(int) truffle_BASETYPE_check(PyObject* type) {
     return PyType_HasFeature(Py_TYPE(type), Py_TPFLAGS_BASETYPE);
 }

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

@@ -305,6 +305,34 @@ def test_inheret_numbers_slots(self):
         assert X.B_has_add_slot()
         assert Y.E_has_add_slot()
 
+    def test_managed_class_with_native_base(self):
+        NativeModule = CPyExtType("NativeModule_", 
+                            '''
+                            PyTypeObject NativeBase_Type = {
+                                PyVarObject_HEAD_INIT(&PyType_Type, 0)
+                                .tp_name = "NativeModule_.NativeBase",
+                                .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+                                .tp_base = &PyModule_Type,
+                            };
+
+                            static PyObject* get_NativeBase_type(PyObject* cls) {
+                                return (PyObject*) &NativeBase_Type;
+                            }
+
+                            ''',
+                            tp_methods='''{"get_NativeBase_type", (PyCFunction)get_NativeBase_type, METH_NOARGS | METH_CLASS, ""}''',
+                            ready_code='''
+                               /* testing lazy type initialization */
+                               // if (PyType_Ready(&NativeBase_Type) < 0)
+                               //     return NULL;
+                               ''',
+                            )
+        NativeBase = NativeModule.get_NativeBase_type()
+        assert NativeBase
+        class ManagedType(NativeBase):
+            def __init__(self):
+                super(ManagedType, self).__init__("DummyModuleName")
+        assert ManagedType()
 
     def test_index(self):
         TestIndex = CPyExtType("TestIndex",

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

@@ -313,6 +313,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_UNICODE_SUBTYPE_NEW("unicode_subtype_new"),
     FUN_CHECK_BASESIZE_FOR_GETSTATE("tuffle_check_basesize_for_getstate"),
     FUN_TRUFFLE_SET_TP_FLAGS("truffle_set_tp_flags"),
+    FUN_TRUFFLE_CHECK_TYPE_READY("truffle_check_type_ready"),
 
     /* PyDateTime_CAPI */
 

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

@@ -35,6 +35,9 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonClassNativeWrapper;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
@@ -267,6 +270,10 @@ private void unsafeSetSuperClass(PythonAbstractClass... newBaseClasses) {
         }
         for (PythonAbstractClass base : getBaseClasses()) {
             if (base != null) {
+                if (PGuards.isNativeClass(base)) {
+                    Object nativeBase = ToSulongNode.getUncached().execute(base);
+                    PCallCapiFunction.getUncached().call(NativeCAPISymbol.FUN_TRUFFLE_CHECK_TYPE_READY, nativeBase);
+                }
                 GetSubclassesNode.getUncached().execute(base).add(this);
             }
         }