1 files changed, 56 insertions, 26 deletions

diff --git a/sources/shiboken6/libshiboken/pep384impl.cpp b/sources/shiboken6/libshiboken/pep384impl.cpp
index 4826fb379..5310207a3 100644
--- a/sources/shiboken6/libshiboken/pep384impl.cpp
+++ b/sources/shiboken6/libshiboken/pep384impl.cpp
@@ -105,13 +105,13 @@ static PyType_Spec typeprobe_spec = {
 static void
 check_PyTypeObject_valid()
 {
-    auto *obtype = reinterpret_cast<PyObject *>(&PyType_Type);
-    auto *probe_tp_base = reinterpret_cast<PyTypeObject *>(
-        PyObject_GetAttr(obtype, Shiboken::PyMagicName::base()));
+    auto *typetype = &PyType_Type;
+    auto *obtype = reinterpret_cast<PyObject *>(typetype);
+    auto *probe_tp_base_obj = PyObject_GetAttr(obtype, Shiboken::PyMagicName::base());
+    auto *probe_tp_base = reinterpret_cast<PyTypeObject *>(probe_tp_base_obj);
     auto *probe_tp_bases = PyObject_GetAttr(obtype, Shiboken::PyMagicName::bases());
-    auto *check = reinterpret_cast<PyTypeObject *>(
-        PyType_FromSpecWithBases(&typeprobe_spec, probe_tp_bases));
-    auto *typetype = reinterpret_cast<PyTypeObject *>(obtype);
+    auto *checkObj = PyType_FromSpecWithBases(&typeprobe_spec, probe_tp_bases);
+    auto *check = reinterpret_cast<PyTypeObject *>(checkObj);
     PyObject *w = PyObject_GetAttr(obtype, Shiboken::PyMagicName::weakrefoffset());
     long probe_tp_weakrefoffset = PyLong_AsLong(w);
     PyObject *d = PyObject_GetAttr(obtype, Shiboken::PyMagicName::dictoffset());
@@ -149,8 +149,8 @@ check_PyTypeObject_valid()
         || probe_tp_mro             != typetype->tp_mro
         || Py_TPFLAGS_DEFAULT       != (check->tp_flags & Py_TPFLAGS_DEFAULT))
         Py_FatalError("The structure of type objects has changed!");
-    Py_DECREF(check);
-    Py_DECREF(probe_tp_base);
+    Py_DECREF(checkObj);
+    Py_DECREF(probe_tp_base_obj);
     Py_DECREF(w);
     Py_DECREF(d);
     Py_DECREF(probe_tp_bases);
@@ -482,6 +482,47 @@ Pep_GetVerboseFlag()
 }
 #endif // Py_LIMITED_API
 
+// Support for pyerrors.h
+
+#if defined(Py_LIMITED_API) || PY_VERSION_HEX < 0x030C0000
+// Emulate PyErr_GetRaisedException() using the deprecated PyErr_Fetch()/PyErr_Store()
+PyObject *PepErr_GetRaisedException()
+{
+    PyObject *type{};
+    PyObject *value{};
+    PyObject *traceback{};
+    PyErr_Fetch(&type, &value, &traceback);
+    Py_XINCREF(value);
+    PyErr_Restore(type, value, traceback);
+    return value;
+}
+
+struct PepException_HEAD
+{
+    PyObject_HEAD
+    PyObject *x1; // dict
+    PyObject *args;
+};
+
+// PyException_GetArgs/PyException_SetArgs were added to the stable API in 3.12
+PyObject *PepException_GetArgs(PyObject *ex)
+{
+    auto *h = reinterpret_cast<PepException_HEAD *>(ex);
+    Py_XINCREF(h->args);
+    return h->args;
+}
+
+LIBSHIBOKEN_API void PepException_SetArgs(PyObject *ex, PyObject *args)
+{
+    auto *h = reinterpret_cast<PepException_HEAD *>(ex);
+    Py_XINCREF(args);
+    auto *old = h->args; // Py_XSETREF()
+    h->args = args;
+    Py_XDECREF(old);
+
+}
+#endif // Limited or < 3.12
+
 /*****************************************************************************
  *
  * Support for code.h
@@ -722,11 +763,8 @@ PyTypeObject *PepStaticMethod_TypePtr = nullptr;
 static PyTypeObject *
 getStaticMethodType(void)
 {
-    // this works for Python 3, only
-    //    "StaticMethodType = type(str.__dict__['maketrans'])\n";
     static const char prog[] =
-        "from xxsubtype import spamlist\n"
-        "result = type(spamlist.__dict__['staticmeth'])\n";
+        "result = type(str.__dict__['maketrans'])\n";
     return reinterpret_cast<PyTypeObject *>(PepRun_GetResult(prog));
 }
 
@@ -1009,9 +1047,12 @@ long _PepRuntimeVersion()
 
 SbkObjectTypePrivate *PepType_SOTP(PyTypeObject *type)
 {
+    // PYSIDE-2676: Use the meta type explicitly.
+    //              A derived type would fail the offset calculation.
+    static auto *meta = SbkObjectType_TypeF();
     assert(SbkObjectType_Check(type));
     auto *obType = reinterpret_cast<PyObject *>(type);
-    void *data = PyObject_GetTypeData(obType, Py_TYPE(obType));
+    void *data = PyObject_GetTypeData(obType, meta);
     return reinterpret_cast<SbkObjectTypePrivate *>(data);
 }
 
@@ -1061,11 +1102,12 @@ static thread_local SbkObjectTypePrivate *SOTP_value{};
 
 SbkObjectTypePrivate *PepType_SOTP(PyTypeObject *type)
 {
+    static auto *meta = SbkObjectType_TypeF();
     static bool use_312 = _PepRuntimeVersion() >= 0x030C00;
     assert(SbkObjectType_Check(type));
     if (use_312) {
         auto *obType = reinterpret_cast<PyObject *>(type);
-        void *data = PepObject_GetTypeData(obType, Py_TYPE(obType));
+        void *data = PepObject_GetTypeData(obType, meta);
         return reinterpret_cast<SbkObjectTypePrivate *>(data);
     }
     if (type == SOTP_key)
@@ -1092,18 +1134,6 @@ void PepType_SOTP_delete(PyTypeObject *type)
 
 #endif // !defined(Py_LIMITED_API) && PY_VERSION_HEX >= 0x030C0000
 
-void _PepPostInit_SbkObject_Type(PyTypeObject *type)
-{
-    // Special init for SbkObject_Type.
-    // A normal initialization would recurse PepType_SOTP.
-    if (_PepRuntimeVersion() >= 0x030C00) {
-        auto *obType = reinterpret_cast<PyObject *>(type);
-        void *data = PepObject_GetTypeData(obType, Py_TYPE(obType));
-        auto *sbkExt = reinterpret_cast<SbkObjectTypePrivate *>(data);
-        std::fill_n(reinterpret_cast<char *>(data), sizeof(*sbkExt), 0);
-    }
-}
-
 /*
  * SbkEnumType extender
  */