Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ib1d2c1b76a043526e8f715e45296104cad085a4a

6 files changed, 36 insertions, 9 deletions

diff --git a/sources/shiboken2/libshiboken/bindingmanager.cpp b/sources/shiboken2/libshiboken/bindingmanager.cpp
index 4f8c6068a..7b06a4a00 100644
--- a/sources/shiboken2/libshiboken/bindingmanager.cpp
+++ b/sources/shiboken2/libshiboken/bindingmanager.cpp
@@ -305,15 +305,21 @@ PyObject *BindingManager::getOverride(const void *cptr, PyObject *methodNameCach
 
     PyObject *method = PyObject_GetAttr(reinterpret_cast<PyObject *>(wrapper), pyMethodName);
 
-    if (method && PyMethod_Check(method)
-        && PyMethod_GET_SELF(method) == reinterpret_cast<PyObject *>(wrapper)) {
+    // PYSIDE-198: Support for Nuitka compiled methods.
+    bool isMethod = method && PyMethod_Check(method);
+    bool isCompiled = !(   isMethod
+                        || Py_TYPE(method) == &PyCFunction_Type
+                        || Py_TYPE(method)->tp_call == nullptr);
+    Shiboken::AutoDecRef meth_self(PyObject_GetAttr(method, Shiboken::PyMagicName::self()));
+    bool wrapsParent = meth_self.object() == reinterpret_cast<PyObject *>(wrapper);
+    if ((isMethod && wrapsParent) || isCompiled) {
         PyObject *defaultMethod;
         PyObject *mro = Py_TYPE(wrapper)->tp_mro;
 
         // The first class in the mro (index 0) is the class being checked and it should not be tested.
         // The last class in the mro (size - 1) is the base Python object class which should not be tested also.
-        for (int i = 1; i < PyTuple_GET_SIZE(mro) - 1; i++) {
-            auto *parent = reinterpret_cast<PyTypeObject *>(PyTuple_GET_ITEM(mro, i));
+        for (int idx = 1; idx < PyTuple_GET_SIZE(mro) - 1; ++idx) {
+            auto *parent = reinterpret_cast<PyTypeObject *>(PyTuple_GET_ITEM(mro, idx));
             if (parent->tp_dict) {
                 defaultMethod = PyDict_GetItem(parent->tp_dict, pyMethodName);
                 if (defaultMethod && PyMethod_GET_FUNCTION(method) != defaultMethod)
diff --git a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
index 3a74bb42e..b7d9d2793 100644
--- a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
+++ b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
@@ -73,7 +73,7 @@ def bootstrap():
     if recursion_trap:
         # we are probably called from outside, already
         print("Recursion occurred in Bootstrap. Did you start by hand? Then it's ok.")
-        print("""But you should trigger start by 'eval("type.__signature__")', only!""")
+        print("But you should trigger start by '_init_pyside_extension()', only!")
     recursion_trap += 1
 
     @contextmanager
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp b/sources/shiboken2/libshiboken/sbkstaticstrings.cpp
index 602c0619b..564853edb 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp
+++ b/sources/shiboken2/libshiboken/sbkstaticstrings.cpp
@@ -86,6 +86,7 @@ STATIC_STRING_IMPL(members, "__members__")
 STATIC_STRING_IMPL(module, "__module__")
 STATIC_STRING_IMPL(name, "__name__")
 STATIC_STRING_IMPL(qualname, "__qualname__")
+STATIC_STRING_IMPL(self, "__self__")
 
 // Internal:
 STATIC_STRING_IMPL(base, "__base__")
@@ -99,7 +100,6 @@ STATIC_STRING_IMPL(iter, "__iter__")
 STATIC_STRING_IMPL(mro, "__mro__")
 STATIC_STRING_IMPL(new_, "__new__")
 STATIC_STRING_IMPL(objclass, "__objclass__")
-STATIC_STRING_IMPL(self, "__self__")
 STATIC_STRING_IMPL(signature, "__signature__")
 STATIC_STRING_IMPL(weakrefoffset, "__weakrefoffset__")
 } // namespace PyMagicName
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings.h b/sources/shiboken2/libshiboken/sbkstaticstrings.h
index df0c683b0..d8744bd8d 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings.h
+++ b/sources/shiboken2/libshiboken/sbkstaticstrings.h
@@ -72,6 +72,7 @@ LIBSHIBOKEN_API PyObject *members();
 LIBSHIBOKEN_API PyObject *module();
 LIBSHIBOKEN_API PyObject *name();
 LIBSHIBOKEN_API PyObject *qualname();
+LIBSHIBOKEN_API PyObject *self();
 } // namespace PyMagicName
 } // namespace Shiboken
 
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings_p.h b/sources/shiboken2/libshiboken/sbkstaticstrings_p.h
index 12c11376f..c33fa0299 100644
--- a/sources/shiboken2/libshiboken/sbkstaticstrings_p.h
+++ b/sources/shiboken2/libshiboken/sbkstaticstrings_p.h
@@ -67,7 +67,6 @@ PyObject *module();
 PyObject *mro();
 PyObject *new_();
 PyObject *objclass();
-PyObject *self();
 PyObject *signature();
 PyObject *weakrefoffset();
 } // namespace PyMagicName
diff --git a/sources/shiboken2/libshiboken/signature.cpp b/sources/shiboken2/libshiboken/signature.cpp
index e2c02a196..70f1e8de7 100644
--- a/sources/shiboken2/libshiboken/signature.cpp
+++ b/sources/shiboken2/libshiboken/signature.cpp
@@ -98,6 +98,7 @@ static PyObject *PySide_BuildSignatureProps(PyObject *class_mod);
 
 static void init_module_1(void);
 static void init_module_2(void);
+static PyObject *_init_pyside_extension(PyObject * /* self */, PyObject * /* args */);
 
 static PyObject *
 CreateSignature(PyObject *props, PyObject *key)
@@ -486,8 +487,14 @@ static const unsigned char PySide_SignatureLoader[] = {
 #include "embed/signature_bootstrap_inc.h"
     };
 
+// This function will be inserted into __builtins__.
+static PyMethodDef init_methods[] = {
+    {"_init_pyside_extension", (PyCFunction)_init_pyside_extension, METH_NOARGS},
+    {nullptr, nullptr}
+};
+
 static safe_globals_struc *
-init_phase_1(void)
+init_phase_1(PyMethodDef *init_meth)
 {
     {
         auto *p = reinterpret_cast<safe_globals_struc *>
@@ -582,6 +589,12 @@ init_phase_1(void)
         // This function will be disabled until phase 2 is done.
         p->finish_import_func = nullptr;
 
+        // Initialize the explicit init function.
+        Shiboken::AutoDecRef init(PyCFunction_NewEx(init_meth, nullptr, nullptr));
+        if (init.isNull()
+            || PyDict_SetItemString(PyEval_GetBuiltins(), init_meth->ml_name, init) != 0)
+            goto error;
+
         return p;
     }
 error:
@@ -870,6 +883,14 @@ get_signature(PyObject * /* self */, PyObject *args)
     Py_RETURN_NONE;
 }
 
+static PyObject *
+_init_pyside_extension(PyObject * /* self */, PyObject * /* args */)
+{
+    init_module_1();
+    init_module_2();
+    Py_RETURN_NONE;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 //
 // This special Type_Ready does certain initializations earlier with
@@ -955,7 +976,7 @@ init_module_1(void)
     static int init_done = 0;
 
     if (!init_done) {
-        pyside_globals = init_phase_1();
+        pyside_globals = init_phase_1(init_methods);
         if (pyside_globals != nullptr)
             init_done = 1;
     }