shiboken2: Ensure there are no AbstractMetaType with Invalid usage

Introduce new values for the pattern enum representing
template parameters, which were previously invalid and add
a missing call to decideUsagePattern().

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

3 files changed, 14 insertions, 4 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 8ef2866c2..15710de4c 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -1981,14 +1981,13 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
 {
     Q_ASSERT(!typeInfo.name.isEmpty());
     TypeDatabase* typeDb = TypeDatabase::instance();
-    TypeEntry* type;
 
     QString typeName = typeInfo.name;
 
     if (typeName == QLatin1String("void"))
         return AbstractMetaType::createVoid();
 
-    type = typeDb->findType(typeName);
+    TypeEntry *type = typeDb->findType(typeName);
     if (!type)
         type = typeDb->findFlagsType(typeName);
 
@@ -2049,6 +2048,8 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
             metaType->addInstantiation(metaArgType);
         }
         metaType->setTypeUsagePattern(AbstractMetaType::ContainerPattern);
+    } else {
+        metaType->decideUsagePattern();
     }
 
     return metaType;
@@ -2369,6 +2370,7 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo
         }
     }
 
+    Q_ASSERT(metaType->typeUsagePattern() != AbstractMetaType::InvalidPattern);
     return metaType.take();
 }
 
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
index 458e54626..baeab19fd 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
@@ -312,9 +312,15 @@ QString AbstractMetaType::pythonSignature() const
 
 AbstractMetaType::TypeUsagePattern AbstractMetaType::determineUsagePattern() const
 {
-    if (m_typeEntry->isTemplateArgument() || m_referenceType == RValueReference)
+    if (m_referenceType == RValueReference)
         return InvalidPattern;
 
+    if (m_typeEntry->isTemplateArgument())
+        return TemplateArgument;
+
+    if (m_typeEntry->type() == TypeEntry::ConstantValueType)
+        return NonTypeTemplateArgument;
+
     if (m_typeEntry->isPrimitive() && (actualIndirections() == 0 || passByConstRef()))
         return PrimitivePattern;
 
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index 988815dd3..c100c63a1 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -294,7 +294,9 @@ public:
         SmartPointerPattern,
         VarargsPattern,
         ArrayPattern,
-        VoidPattern // Plain "void", no "void *" or similar.
+        VoidPattern,            // Plain "void", no "void *" or similar.
+        TemplateArgument,       // 'T' in std::array<T,2>
+        NonTypeTemplateArgument // '2' in in std::array<T,2>
     };
     Q_ENUM(TypeUsagePattern)