shiboken6: Fix support of multiple smart pointer types

The function searching for the instantiations of smart pointers
was not checking for the smart pointer type entry,
so, QSharedPointer<int> was hiding std::shared_ptr<int>.
Check for the type entry as well.

Rearrange the code a bit.

Task-numnber: PYSIDE-454
Change-Id: Ib7a0385ce2c0f8de84b644168b0164f13f3332ad
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 069f7309d72b2a1f80638641ac3d6269b6aefc1d)

1 files changed, 12 insertions, 12 deletions

diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp
index dd56ab7cd..f90cd312f 100644
--- a/sources/shiboken2/generator/generator.cpp
+++ b/sources/shiboken2/generator/generator.cpp
@@ -276,24 +276,24 @@ void Generator::addInstantiatedContainersAndSmartPointers(const AbstractMetaType
         return;
 
     }
-    QString typeName = getSimplifiedContainerTypeName(type);
     if (isContainer) {
+        QString typeName = getSimplifiedContainerTypeName(type);
         if (!m_d->instantiatedContainersNames.contains(typeName)) {
             m_d->instantiatedContainersNames.append(typeName);
             m_d->instantiatedContainers.append(type);
         }
-    } else {
-        // Is smart pointer. Check if the (const?) pointee is already known
-        auto pt = pointeeTypeEntry(type);
-        const bool present =
-            std::any_of(m_d->instantiatedSmartPointers.cbegin(), m_d->instantiatedSmartPointers.cend(),
-                        [pt] (const AbstractMetaType *t) {
-                            return pointeeTypeEntry(t) == pt;
-                        });
-        if (!present)
-            m_d->instantiatedSmartPointers.append(canonicalSmartPtrInstantiation(type));
+        return;
     }
-
+    // Is smart pointer. Check if the (const?) pointee is already known for the given
+    // smart pointer type entry.
+    auto pt = pointeeTypeEntry(type);
+    const bool present =
+        std::any_of(m_d->instantiatedSmartPointers.cbegin(), m_d->instantiatedSmartPointers.cend(),
+                    [typeEntry, pt] (const AbstractMetaType *t) {
+                        return t->typeEntry() == typeEntry && pointeeTypeEntry(t) == pt;
+                    });
+    if (!present)
+        m_d->instantiatedSmartPointers.append(canonicalSmartPtrInstantiation(type));
 }
 
 void Generator::collectInstantiatedContainersAndSmartPointers(const AbstractMetaFunction *func)