Do not return a null scope from storedType()

We can store everything in a QJSValue. Returning an invalid scope
triggers inadequate code paths later on.

Change-Id: I700d7a3219e5784d3ec125806f70018417ceac14
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit f6294b7938c221974cdf3a39d7d71addf5b08f6b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/qmlcompiler/qqmljstyperesolver.cpp b/src/qmlcompiler/qqmljstyperesolver.cpp
index 6cfe756ab8..9c5264e68d 100644
--- a/src/qmlcompiler/qqmljstyperesolver.cpp
+++ b/src/qmlcompiler/qqmljstyperesolver.cpp
@@ -942,8 +942,13 @@ QQmlJSScope::ConstPtr QQmlJSTypeResolver::storedType(const QQmlJSScope::ConstPtr
         return jsPrimitiveType();
     if (type->isScript())
         return jsValueType();
-    if (type->isComposite())
-        return QQmlJSScope::nonCompositeBaseType(type);
+    if (type->isComposite()) {
+        if (const QQmlJSScope::ConstPtr nonComposite = QQmlJSScope::nonCompositeBaseType(type))
+            return nonComposite;
+
+        // If we can't find the non-composite base, we really don't know what it is.
+        return genericType(type);
+    }
     if (type->fileName().isEmpty())
         return genericType(type);
     return type;