QtQml: Properly enforce signatures of AOT-compiled functions

Pass the metatypes of the contained types rather than the stored types.

[ChangeLog][QtQml][Important Behavior Changes] The AOT compiled code for
type-annotated JavaScript functions does not let you pass or return
values of the wrong type anymore.

Fixes: QTBUG-119885
Change-Id: I685d398c0745d32a999a3abd76c622a2c0d6651f
Reviewed-by: Olivier De Cannière <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qmlcompiler/qqmljsstoragegeneralizer.cpp b/src/qmlcompiler/qqmljsstoragegeneralizer.cpp
index 077c1dcc01..937c35ddcd 100644
--- a/src/qmlcompiler/qqmljsstoragegeneralizer.cpp
+++ b/src/qmlcompiler/qqmljsstoragegeneralizer.cpp
@@ -24,13 +24,13 @@ QQmlJSStorageGeneralizer::run(Function *function, QQmlJS::DiagnosticMessage *err
 {
     m_error = error;
 
-    if (QQmlJSScope::ConstPtr &returnType = function->returnType) {
+    if (QQmlJSRegisterContent &returnType = function->returnType; returnType.isValid()) {
         if (QQmlJSScope::ConstPtr stored = m_typeResolver->genericType(
-                    returnType, QQmlJSTypeResolver::ComponentIsGeneric::Yes)) {
-            returnType = stored;
+                    returnType.storedType(), QQmlJSTypeResolver::ComponentIsGeneric::Yes)) {
+            returnType = returnType.storedIn(stored);
         } else {
             setError(QStringLiteral("Cannot store the return type %1.")
-                     .arg(returnType->internalName(), 0));
+                     .arg(returnType.storedType()->internalName()));
             return {};
         }
     }