QmlCompiler: Allow creation of actual QVariantMaps from object literals

There are places where we need this:

a, If the method in question actually takes a QVariantMap as argument.
b, If the resulting value can be shadowed. In that case we expect a
   QVariant. The engine has to internally convert to the expected type
   then.

Change-Id: Ic5b3faab4578d64ca757de644fe69660fd70e52a
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Sami Shalayel <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>

1 files changed, 10 insertions, 4 deletions

diff --git a/src/qmlcompiler/qqmljsbasicblocks.cpp b/src/qmlcompiler/qqmljsbasicblocks.cpp
index 73b4721848..6a535b9582 100644
--- a/src/qmlcompiler/qqmljsbasicblocks.cpp
+++ b/src/qmlcompiler/qqmljsbasicblocks.cpp
@@ -648,13 +648,19 @@ void QQmlJSBasicBlocks::adjustTypes()
         const InstructionAnnotation &annotation = m_annotations[object.instructionOffset];
 
         Q_ASSERT(it->trackedTypes.size() == 1);
-        Q_ASSERT(it->trackedTypes[0] == m_typeResolver->containedType(annotation.changedRegister));
+        QQmlJSScope::ConstPtr resultType = it->trackedTypes[0];
+
+        Q_ASSERT(resultType == m_typeResolver->containedType(annotation.changedRegister));
         Q_ASSERT(!annotation.readRegisters.isEmpty());
 
-        if (!m_typeResolver->adjustTrackedType(it->trackedTypes[0], it->typeReaders.values()))
-            setError(adjustErrorMessage(it->trackedTypes[0], it->typeReaders.values()));
+        if (!m_typeResolver->adjustTrackedType(resultType, it->typeReaders.values()))
+            setError(adjustErrorMessage(resultType, it->typeReaders.values()));
 
-        QQmlJSScope::ConstPtr resultType = it->trackedTypes[0];
+        if (m_typeResolver->equals(resultType, m_typeResolver->varType())
+                || m_typeResolver->equals(resultType, m_typeResolver->variantMapType())) {
+            // It's all variant anyway
+            return;
+        }
 
         const int classSize = m_jsUnitGenerator->jsClassSize(object.internalClassId);
         Q_ASSERT(object.argc >= classSize);