shiboken: Get rid of tp_dict in general, amended

A few more cases of cppgenerator were added. This are
now really all cases, because tp_dict is no longer
exported.

As a very positive side effect, there is no longer
direct tp_dict access in the "init_<type>" functions.
Usage of PepType_GetDict would have created a permanent
extra-reference.

NOTE: It was necessary to set SKIP_UNITY_BUILD_INCLUSION
on pep384impl.cpp in order to let this work with unity.

Change-Id: I021dbc978b51265db96d5d3d438e06aa96230cc1
Pick-to: 6.2 6.5 6.6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 9 insertions, 1 deletions

diff --git a/sources/shiboken6/libshiboken/basewrapper.cpp b/sources/shiboken6/libshiboken/basewrapper.cpp
index adeaf6487..1ce61eadf 100644
--- a/sources/shiboken6/libshiboken/basewrapper.cpp
+++ b/sources/shiboken6/libshiboken/basewrapper.cpp
@@ -950,8 +950,16 @@ introduceWrapperType(PyObject *enclosingObject,
     setDestructorFunction(type, cppObjDtor);
     auto *ob_type = reinterpret_cast<PyObject *>(type);
 
-    if (wrapperFlags & InnerClass)
+    if (wrapperFlags & InnerClass) {
+        // PYSIDE-2230: Instead of tp_dict, use the enclosing type.
+        //              This stays interface compatible.
+        if (PyType_Check(enclosingObject)) {
+            AutoDecRef tpDict(PepType_GetDict(reinterpret_cast<PyTypeObject *>(enclosingObject)));
+            return PyDict_SetItemString(tpDict, typeName, ob_type) == 0 ? type : nullptr;
+        }
+        assert(PyDict_Check(enclosingObject));
         return PyDict_SetItemString(enclosingObject, typeName, ob_type) == 0 ? type : nullptr;
+    }
 
     // PyModule_AddObject steals type's reference.
     Py_INCREF(ob_type);