Properly handle redeclarations of variables

This is only allowed for var type variables. Also fixes an
assertion we'd run into with code such as

let x; var x;

Change-Id: I2588cf37e0964c879c60b4fd292e7d7b5476e322
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 23 insertions, 20 deletions

diff --git a/src/qml/compiler/qv4compilercontext_p.h b/src/qml/compiler/qv4compilercontext_p.h
index 8fabf41c40..455a76c729 100644
--- a/src/qml/compiler/qv4compilercontext_p.h
+++ b/src/qml/compiler/qv4compilercontext_p.h
@@ -257,29 +257,32 @@ struct Context {
         usedVariables.insert(name);
     }
 
-    void addLocalVar(const QString &name, MemberType type, QQmlJS::AST::VariableDeclaration::VariableScope scope, QQmlJS::AST::FunctionExpression *function = nullptr)
+    bool addLocalVar(const QString &name, MemberType type, QQmlJS::AST::VariableDeclaration::VariableScope scope, QQmlJS::AST::FunctionExpression *function = nullptr)
     {
-        if (! name.isEmpty()) {
-            if (type != FunctionDefinition) {
-                for (QQmlJS::AST::FormalParameterList *it = formals; it; it = it->next)
-                    if (it->name == name)
-                        return;
-            }
-            MemberMap::iterator it = members.find(name);
-            if (it == members.end()) {
-                Member m;
-                m.type = type;
-                m.function = function;
-                m.scope = scope;
-                members.insert(name, m);
-            } else {
-                Q_ASSERT(scope == (*it).scope);
-                if ((*it).type <= type) {
-                    (*it).type = type;
-                    (*it).function = function;
-                }
+        if (name.isEmpty())
+            return true;
+
+        if (type != FunctionDefinition) {
+            for (QQmlJS::AST::FormalParameterList *it = formals; it; it = it->next)
+                if (it->name == name)
+                    return (scope == QQmlJS::AST::VariableDeclaration::FunctionScope);
+        }
+        MemberMap::iterator it = members.find(name);
+        if (it != members.end()) {
+            if (scope != QQmlJS::AST::VariableDeclaration::FunctionScope || (*it).scope != QQmlJS::AST::VariableDeclaration::FunctionScope)
+                return false;
+            if ((*it).type <= type) {
+                (*it).type = type;
+                (*it).function = function;
             }
+            return true;
         }
+        Member m;
+        m.type = type;
+        m.function = function;
+        m.scope = scope;
+        members.insert(name, m);
+        return true;
     }
 };