Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I9ed2e696108f11c9153012fcf092541fd0e0d7c8

7 files changed, 72 insertions, 46 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index e66e8ccbff..54d0cb4f46 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -758,7 +758,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
 
         QQmlJS::AST::UiParameterList *p = node->parameters;
         while (p) {
-            const QStringRef &memberType = p->type;
+            const QString memberType = asString(p->type);
 
             if (memberType.isEmpty()) {
                 recordError(node->typeToken, QCoreApplication::translate("QQmlParser","Expected parameter type"));
@@ -781,10 +781,10 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
                     // Must be a QML object type.
                     // Lazily determine type during compilation.
                     param->type = QV4::CompiledData::Property::Custom;
-                    param->customTypeNameIndex = registerString(p->type.toString());
+                    param->customTypeNameIndex = registerString(memberType);
                 } else {
                     QString errStr = QCoreApplication::translate("QQmlParser","Invalid signal parameter type: ");
-                    errStr.append(memberType.toString());
+                    errStr.append(memberType);
                     recordError(node->typeToken, errStr);
                     return false;
                 }
@@ -813,7 +813,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
             return false;
         }
     } else {
-        const QStringRef &memberType = node->memberType;
+        QString memberType = asString(node->memberType);
         if (memberType == QLatin1String("alias")) {
             return appendAlias(node);
         } else {
@@ -858,7 +858,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
                 property->flags |= QV4::CompiledData::Property::IsReadOnly;
             property->type = type;
             if (type >= QV4::CompiledData::Property::Custom)
-                property->customTypeNameIndex = registerString(memberType.toString());
+                property->customTypeNameIndex = registerString(memberType);
             else
                 property->customTypeNameIndex = emptyStringIndex;
 
diff --git a/src/qml/compiler/qqmlpropertycachecreator_p.h b/src/qml/compiler/qqmlpropertycachecreator_p.h
index 10bcd1dbc1..3c14abc019 100644
--- a/src/qml/compiler/qqmlpropertycachecreator_p.h
+++ b/src/qml/compiler/qqmlpropertycachecreator_p.h
@@ -118,7 +118,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::buildMetaObje
 
     bool needVMEMetaObject = obj->propertyCount() != 0 || obj->aliasCount() != 0 || obj->signalCount() != 0 || obj->functionCount() != 0;
     if (!needVMEMetaObject) {
-        for (auto binding = obj->bindingsBegin(), end = obj->bindingsEnd(); binding != end; ++binding) {
+        auto binding = obj->bindingsBegin();
+        auto end = obj->bindingsEnd();
+        for ( ; binding != end; ++binding) {
             if (binding->type == QV4::CompiledData::Binding::Type_Object && (binding->flags & QV4::CompiledData::Binding::IsOnAssignment)) {
                 // If the on assignment is inside a group property, we need to distinguish between QObject based
                 // group properties and value type group properties. For the former the base type is derived from
@@ -162,7 +164,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::buildMetaObje
     }
 
     if (QQmlPropertyCache *thisCache = propertyCaches->at(objectIndex)) {
-        for (auto binding = obj->bindingsBegin(), end = obj->bindingsEnd(); binding != end; ++binding)
+        auto binding = obj->bindingsBegin();
+        auto end = obj->bindingsEnd();
+        for ( ; binding != end; ++binding)
             if (binding->type >= QV4::CompiledData::Binding::Type_Object) {
                 QQmlBindingInstantiationContext context(objectIndex, &(*binding), stringAt(binding->propertyNameIndex), thisCache);
                 QQmlCompileError error = buildMetaObjectRecursively(binding->value.objectIndex, context);
@@ -296,7 +300,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
 
     QmlIR::PropertyResolver resolver(baseTypeCache);
 
-    for (auto p = obj->propertiesBegin(), end = obj->propertiesEnd(); p != end; ++p) {
+    auto p = obj->propertiesBegin();
+    auto pend = obj->propertiesEnd();
+    for ( ; p != pend; ++p) {
         if (p->type == QV4::CompiledData::Property::Var)
             varPropCount++;
 
@@ -306,7 +312,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
             return QQmlCompileError(p->location, QQmlPropertyCacheCreatorBase::tr("Cannot override FINAL property"));
     }
 
-    for (auto a = obj->aliasesBegin(), end = obj->aliasesEnd(); a != end; ++a) {
+    auto a = obj->aliasesBegin();
+    auto aend = obj->aliasesEnd();
+    for ( ; a != aend; ++a) {
         bool notInRevision = false;
         QQmlPropertyData *d = resolver.property(stringAt(a->nameIndex), &notInRevision);
         if (d && d->isFinal())
@@ -340,7 +348,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
     }
 
     // Set up notify signals for properties - first normal, then alias
-    for (auto p = obj->propertiesBegin(), end = obj->propertiesEnd(); p != end; ++p) {
+    p = obj->propertiesBegin();
+    pend = obj->propertiesEnd();
+    for (  ; p != pend; ++p) {
         auto flags = QQmlPropertyData::defaultSignalFlags();
 
         QString changedSigName = stringAt(p->nameIndex) + QLatin1String("Changed");
@@ -349,7 +359,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
         cache->appendSignal(changedSigName, flags, effectiveMethodIndex++);
     }
 
-    for (auto a = obj->aliasesBegin(), end = obj->aliasesEnd(); a != end; ++a) {
+    a = obj->aliasesBegin();
+    aend = obj->aliasesEnd();
+    for ( ; a != aend; ++a) {
         auto flags = QQmlPropertyData::defaultSignalFlags();
 
         QString changedSigName = stringAt(a->nameIndex) + QLatin1String("Changed");
@@ -359,7 +371,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
     }
 
     // Dynamic signals
-    for (auto s = obj->signalsBegin(), end = obj->signalsEnd(); s != end; ++s) {
+    auto s = obj->signalsBegin();
+    auto send = obj->signalsEnd();
+    for ( ; s != send; ++s) {
         const int paramCount = s->parameterCount();
 
         QList<QByteArray> names;
@@ -370,7 +384,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
             paramTypes[0] = paramCount;
 
             int i = 0;
-            for (auto param = s->parametersBegin(), end = s->parametersEnd(); param != end; ++param, ++i) {
+            auto param = s->parametersBegin();
+            auto end = s->parametersEnd();
+            for ( ; param != end; ++param, ++i) {
                 names.append(stringAt(param->nameIndex).toUtf8());
                 if (param->type < builtinTypeCount) {
                     // built-in type
@@ -415,7 +431,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
 
 
     // Dynamic slots
-    for (auto function = objectContainer->objectFunctionsBegin(obj), end = objectContainer->objectFunctionsEnd(obj); function != end; ++function) {
+    auto function = objectContainer->objectFunctionsBegin(obj);
+    auto fend = objectContainer->objectFunctionsEnd(obj);
+    for ( ; function != fend; ++function) {
         auto flags = QQmlPropertyData::defaultSlotFlags();
 
         const QString slotName = stringAt(function->nameIndex);
@@ -425,7 +443,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
         // protect against overriding change signals or methods with properties.
 
         QList<QByteArray> parameterNames;
-        for (auto formal = function->formalsBegin(), end = function->formalsEnd(); formal != end; ++formal) {
+        auto formal = function->formalsBegin();
+        auto end = function->formalsEnd();
+        for ( ; formal != end; ++formal) {
             flags.hasArguments = true;
             parameterNames << stringAt(*formal).toUtf8();
         }
@@ -437,7 +457,9 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
     // Dynamic properties
     int effectiveSignalIndex = cache->signalHandlerIndexCacheStart;
     int propertyIdx = 0;
-    for (auto p = obj->propertiesBegin(), end = obj->propertiesEnd(); p != end; ++p, ++propertyIdx) {
+    p = obj->propertiesBegin();
+    pend = obj->propertiesEnd();
+    for ( ; p != pend; ++p, ++propertyIdx) {
         int propertyType = 0;
         QQmlPropertyData::Flags propertyFlags;
 
@@ -561,7 +583,9 @@ inline void QQmlPropertyCacheAliasCreator<ObjectContainer>::appendAliasPropertie
         return;
 
     const auto allAliasTargetsExist = [this, &component](const CompiledObject &object) {
-        for (auto alias = object.aliasesBegin(), end = object.aliasesEnd(); alias != end; ++alias) {
+        auto alias = object.aliasesBegin();
+        auto end = object.aliasesEnd();
+        for ( ; alias != end; ++alias) {
             Q_ASSERT(alias->flags & QV4::CompiledData::Alias::Resolved);
 
             const int targetObjectIndex = objectForId(component, alias->targetObjectId);
@@ -612,7 +636,9 @@ inline void QQmlPropertyCacheAliasCreator<ObjectContainer>::collectObjectsWithAl
     if (object.flags & QV4::CompiledData::Object::IsComponent && objectIndex != objectContainer->rootObjectIndex())
         return;
 
-    for (auto binding = object.bindingsBegin(), end = object.bindingsEnd(); binding != end; ++binding) {
+    auto binding = object.bindingsBegin();
+    auto end = object.bindingsEnd();
+    for (; binding != end; ++binding) {
         if (binding->type != QV4::CompiledData::Binding::Type_Object
             && binding->type != QV4::CompiledData::Binding::Type_AttachedProperty
             && binding->type != QV4::CompiledData::Binding::Type_GroupProperty)
@@ -707,7 +733,9 @@ inline void QQmlPropertyCacheAliasCreator<ObjectContainer>::appendAliasesToPrope
     int effectivePropertyIndex = propertyCache->propertyIndexCacheStart + propertyCache->propertyIndexCache.count();
 
     int aliasIndex = 0;
-    for (auto alias = object.aliasesBegin(), end = object.aliasesEnd(); alias != end; ++alias, ++aliasIndex) {
+    auto alias = object.aliasesBegin();
+    auto end = object.aliasesEnd();
+    for ( ; alias != end; ++alias, ++aliasIndex) {
         Q_ASSERT(alias->flags & QV4::CompiledData::Alias::Resolved);
 
         int type = 0;
diff --git a/src/qml/compiler/qqmlpropertyvalidator.cpp b/src/qml/compiler/qqmlpropertyvalidator.cpp
index 45379d5155..383c20239f 100644
--- a/src/qml/compiler/qqmlpropertyvalidator.cpp
+++ b/src/qml/compiler/qqmlpropertyvalidator.cpp
@@ -412,7 +412,7 @@ QQmlCompileError QQmlPropertyValidator::validateLiteralBinding(QQmlPropertyCache
         }
     }
     break;
-#ifndef QT_NO_DATESTRING
+#if QT_CONFIG(datestring)
     case QVariant::Date: {
         bool ok = false;
         QQmlStringConverters::dateFromString(binding->valueAsString(qmlUnit), &ok);
@@ -437,7 +437,7 @@ QQmlCompileError QQmlPropertyValidator::validateLiteralBinding(QQmlPropertyCache
         }
     }
     break;
-#endif // QT_NO_DATESTRING
+#endif // datestring
     case QVariant::Point: {
         bool ok = false;
         QQmlStringConverters::pointFFromString(binding->valueAsString(qmlUnit), &ok);
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index 5e05485b93..ab2b0553a9 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -1570,19 +1570,15 @@ bool QQmlJavaScriptBindingExpressionSimplificationPass::simplifyBinding(QV4::IR:
             if (!_canSimplify)
                 return false;
         }
-        if (!_canSimplify)
-            return false;
     }
 
     if (_returnValueOfBindingExpression == -1)
         return false;
 
-    if (_canSimplify) {
-        if (_nameOfFunctionCalled) {
-            if (_functionCallReturnValue != _returnValueOfBindingExpression)
-                return false;
-            return detectTranslationCallAndConvertBinding(binding);
-        }
+    if (_nameOfFunctionCalled) {
+        if (_functionCallReturnValue != _returnValueOfBindingExpression)
+            return false;
+        return detectTranslationCallAndConvertBinding(binding);
     }
 
     return false;
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index e815c41a86..8586c84c3d 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -397,7 +397,7 @@ bool CompilationUnit::loadFromDisk(const QUrl &url, EvalISelFactory *iselFactory
         return false;
     }
 
-    const QString sourcePath = url.toLocalFile();
+    const QString sourcePath = QQmlFile::urlToLocalFileOrQrc(url);
     QScopedPointer<CompilationUnitMapper> cacheFile(new CompilationUnitMapper());
 
     CompiledData::Unit *mappedUnit = cacheFile->open(cacheFilePath(url), sourcePath, errorString);
@@ -471,7 +471,7 @@ QString Binding::valueAsString(const Unit *unit) const
         return QString::number(valueAsNumber());
     case Type_Invalid:
         return QString();
-#ifdef QT_NO_TRANSLATION
+#if !QT_CONFIG(translation)
     case Type_TranslationById:
     case Type_Translation:
         return unit->stringAt(stringIndex);
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 90cbe04505..2682365182 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -71,7 +71,7 @@
 QT_BEGIN_NAMESPACE
 
 // Bump this whenever the compiler data structures change in an incompatible way.
-#define QV4_DATA_STRUCTURE_VERSION 0x07
+#define QV4_DATA_STRUCTURE_VERSION 0x08
 
 class QIODevice;
 class QQmlPropertyCache;
@@ -207,9 +207,9 @@ struct String
 struct Function
 {
     enum Flags : unsigned int {
-        HasDirectEval       = 0x1,
-        UsesArgumentsObject = 0x2,
-        IsStrict            = 0x4,
+        IsStrict            = 0x1,
+        HasDirectEval       = 0x2,
+        UsesArgumentsObject = 0x4,
         IsNamedExpression   = 0x8,
         HasCatchOrWith      = 0x10
     };
@@ -749,7 +749,9 @@ struct TypeReferenceMap : QHash<int, TypeReference>
             r.errorWhenNotFound = true;
         }
 
-        for (auto prop = obj->propertiesBegin(), propEnd = obj->propertiesEnd(); prop != propEnd; ++prop) {
+        auto prop = obj->propertiesBegin();
+        auto propEnd = obj->propertiesEnd();
+        for ( ; prop != propEnd; ++prop) {
             if (prop->type >= QV4::CompiledData::Property::Custom) {
                 // ### FIXME: We could report the more accurate location here by using prop->location, but the old
                 // compiler can't and the tests expect it to be the object location right now.
@@ -758,7 +760,9 @@ struct TypeReferenceMap : QHash<int, TypeReference>
             }
         }
 
-        for (auto binding = obj->bindingsBegin(), bindingEnd = obj->bindingsEnd(); binding != bindingEnd; ++binding) {
+        auto binding = obj->bindingsBegin();
+        auto bindingEnd = obj->bindingsEnd();
+        for ( ; binding != bindingEnd; ++binding) {
             if (binding->type == QV4::CompiledData::Binding::Type_AttachedProperty)
                 this->add(binding->propertyNameIndex, binding->location);
         }
diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index 4fa0cf421b..943700de44 100644
--- a/src/qml/compiler/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
@@ -1838,11 +1838,6 @@ public:
         return *this;
     }
 
-    bool isEmpty() const
-    {
-        return worklistSize == 0;
-    }
-
     unsigned size() const
     {
         return worklistSize;
@@ -1850,7 +1845,7 @@ public:
 
     Stmt *takeNext(Stmt *last)
     {
-        if (isEmpty())
+        if (worklistSize == 0)
             return 0;
 
         const int startAt = last ? last->id() + 1 : 0;
@@ -1866,6 +1861,10 @@ public:
         --worklistSize;
         Stmt *s = stmts.at(pos);
         Q_ASSERT(s);
+
+        if (removed.at(s->id()))
+            return takeNext(s);
+
         return s;
     }
 
@@ -2692,6 +2691,7 @@ void convertConst(Const *c, Type targetType)
     case UndefinedType:
         c->value = qt_qnan();
         c->type = targetType;
+        break;
     default:
         Q_UNIMPLEMENTED();
         Q_ASSERT(!"Unimplemented!");
@@ -3991,9 +3991,7 @@ void optimizeSSA(StatementWorklist &W, DefUses &defUses, DominatorTree &df)
     ExprReplacer replaceUses(defUses, function);
 
     Stmt *s = 0;
-    while (!W.isEmpty()) {
-        s = W.takeNext(s);
-        Q_ASSERT(s);
+    while ((s = W.takeNext(s))) {
 
         if (Phi *phi = s->asPhi()) {
             // dead code elimination: