From eb3087e4b0b770200512925730c328a8bda7f3d7 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Thu, 2 Jan 2014 08:48:55 +0100
Subject: Fix lookups of enums in singletons

This is a regression against 5.2.0 (which didn't have this bug), due to
optimizations introduced in the stable branch after the release. The code path
for optimizing access to the members of C++ based singletons through the
regular meta-object properties would end up excluding access to enums when the
lookup happens at run-time. The run-time getter for the singleton itself would
return a wrapped QObject instead of a QQmlTypeWrapper, and only the latter
includes enums.

As QML based singletons (composite singletons) cannot declare enums, we can
continue to do fast lookups on these, but otherwise have to fall back to the
slower code path.

Task-number: QTBUG-35721

Change-Id: Icc66bdaf3572622cdb718f82b706e3204afa0167
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/qml/compiler/qqmlcodegenerator.cpp | 61 +++++++++++++++-------------------
 1 file changed, 26 insertions(+), 35 deletions(-)

(limited to 'src/qml')

diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp
index 8809221abe..ecb643e0f5 100644
--- a/src/qml/compiler/qqmlcodegenerator.cpp
+++ b/src/qml/compiler/qqmlcodegenerator.cpp
@@ -1347,38 +1347,29 @@ static V4IR::Type resolveQmlType(QQmlEnginePrivate *qmlEngine, V4IR::MemberExpre
     V4IR::Type result = V4IR::VarType;
 
     QQmlType *type = static_cast<QQmlType*>(resolver->data);
-    if (type->isSingleton()) {
-        if (type->isCompositeSingleton()) {
-            QQmlTypeData *tdata = qmlEngine->typeLoader.getType(type->singletonInstanceInfo()->url);
-            Q_ASSERT(tdata);
-            Q_ASSERT(tdata->isComplete());
-            initMetaObjectResolver(resolver, qmlEngine->propertyCacheForType(tdata->compiledData()->metaTypeId));
-            resolver->flags |= AllPropertiesAreFinal;
-        } else {
-            const QMetaObject *singletonMo = type->singletonInstanceInfo()->instanceMetaObject;
-            if (!singletonMo) { // We can only accelerate C++ singletons that were registered with their meta-type
-                resolver->clear();
-                return result;
-            }
-            initMetaObjectResolver(resolver, qmlEngine->cache(singletonMo));
-            resolver->flags |= LookupsIncludeEnums;
+
+    if (member->name->constData()->isUpper()) {
+        bool ok = false;
+        int value = type->enumValue(*member->name, &ok);
+        if (ok) {
+            member->setEnumValue(value);
+            resolver->clear();
+            return V4IR::SInt32Type;
         }
+    }
+
+    if (type->isCompositeSingleton()) {
+        QQmlTypeData *tdata = qmlEngine->typeLoader.getType(type->singletonInstanceInfo()->url);
+        Q_ASSERT(tdata);
+        Q_ASSERT(tdata->isComplete());
+        initMetaObjectResolver(resolver, qmlEngine->propertyCacheForType(tdata->compiledData()->metaTypeId));
+        resolver->flags |= AllPropertiesAreFinal;
+        return resolver->resolveMember(qmlEngine, resolver, member);
+    } else if (const QMetaObject *attachedMeta = type->attachedPropertiesType()) {
+        QQmlPropertyCache *cache = qmlEngine->cache(attachedMeta);
+        initMetaObjectResolver(resolver, cache);
+        member->setAttachedPropertiesId(type->attachedPropertiesId());
         return resolver->resolveMember(qmlEngine, resolver, member);
-    } else {
-        if (member->name->constData()->isUpper()) {
-            bool ok = false;
-            int value = type->enumValue(*member->name, &ok);
-            if (ok) {
-                member->setEnumValue(value);
-                resolver->clear();
-                return V4IR::SInt32Type;
-            }
-        } else if (const QMetaObject *attachedMeta = type->attachedPropertiesType()) {
-            QQmlPropertyCache *cache = qmlEngine->cache(attachedMeta);
-            initMetaObjectResolver(resolver, cache);
-            member->setAttachedPropertiesId(type->attachedPropertiesId());
-            return resolver->resolveMember(qmlEngine, resolver, member);
-        }
     }
 
     resolver->clear();
@@ -1573,14 +1564,14 @@ V4IR::Expr *JSCodeGen::fallbackNameLookup(const QString &name, int line, int col
             } else if (r.type) {
                 V4IR::Name *typeName = _block->NAME(name, line, col);
                 // Make sure the run-time loads this through the more efficient singleton getter.
-                typeName->qmlSingleton = r.type->isSingleton();
+                typeName->qmlSingleton = r.type->isCompositeSingleton();
                 typeName->freeOfSideEffects = true;
-
                 V4IR::Temp *result = _block->TEMP(_block->newTemp());
-                initQmlTypeResolver(&result->memberResolver, r.type);
-
                 _block->MOVE(result, typeName);
-                return _block->TEMP(result->index);
+
+                result = _block->TEMP(result->index);
+                initQmlTypeResolver(&result->memberResolver, r.type);
+                return result;
             } else {
                 Q_ASSERT(r.importNamespace);
                 V4IR::Name *namespaceName = _block->NAME(name, line, col);
-- 
cgit v1.2.3