shiboken: Handle all base classes in AbstractMetaClass::fixFunctions()

Loop over base classes and remove the recursion at the bottom
since superClass->fixFunctions() is already called at the top.

Change-Id: I1342d4717a6131c5d8cc25be03c85040a493155a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 9 insertions, 15 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
index 08fedc5ee..e6590e2dc 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
@@ -2167,27 +2167,23 @@ void AbstractMetaClass::fixFunctions()
 
     m_functionsFixed = true;
 
-    AbstractMetaClass *superClass = baseClass();
     AbstractMetaFunctionList funcs = functions();
 
-    if (superClass)
+    for (auto superClass : m_baseClasses) {
         superClass->fixFunctions();
-    while (superClass) {
         // Since we always traverse the complete hierarchy we are only
         // interrested in what each super class implements, not what
         // we may have propagated from their base classes again.
         AbstractMetaFunctionList superFuncs;
-        if (superClass) {
-            // Super classes can never be final
-            if (superClass->isFinalInTargetLang()) {
-                qCWarning(lcShiboken).noquote().nospace()
-                    << "Final class '" << superClass->name() << "' set to non-final, as it is extended by other classes";
-                *superClass -= AbstractMetaAttributes::FinalInTargetLang;
-            }
-            superFuncs = superClass->queryFunctions(AbstractMetaClass::ClassImplements);
-            AbstractMetaFunctionList virtuals = superClass->queryFunctions(AbstractMetaClass::VirtualInCppFunctions);
-            superFuncs += virtuals;
+        // Super classes can never be final
+        if (superClass->isFinalInTargetLang()) {
+            qCWarning(lcShiboken).noquote().nospace()
+                << "Final class '" << superClass->name() << "' set to non-final, as it is extended by other classes";
+            *superClass -= AbstractMetaAttributes::FinalInTargetLang;
         }
+        superFuncs = superClass->queryFunctions(AbstractMetaClass::ClassImplements);
+        AbstractMetaFunctionList virtuals = superClass->queryFunctions(AbstractMetaClass::VirtualInCppFunctions);
+        superFuncs += virtuals;
 
         QSet<AbstractMetaFunction *> funcsToAdd;
         for (auto sf : qAsConst(superFuncs)) {
@@ -2316,8 +2312,6 @@ void AbstractMetaClass::fixFunctions()
             (*copy) += AddedMethod;
             funcs.append(copy);
         }
-
-        superClass = superClass->baseClass();
     }
 
     bool hasPrivateConstructors = false;