Fix sanity checks when declaring variables

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

1 files changed, 7 insertions, 5 deletions

diff --git a/src/qml/compiler/qv4compilercontext.cpp b/src/qml/compiler/qv4compilercontext.cpp
index d232a43291..7dc8b68d78 100644
--- a/src/qml/compiler/qv4compilercontext.cpp
+++ b/src/qml/compiler/qv4compilercontext.cpp
@@ -73,16 +73,13 @@ Context *Module::newContext(Node *node, Context *parent, ContextType contextType
 
 bool Context::addLocalVar(const QString &name, Context::MemberType type, VariableScope scope, FunctionExpression *function)
 {
-    // hoist var declarations to the function level
-    if (contextType == ContextType::Block && (scope == VariableScope::Var && type != MemberType::FunctionDefinition))
-        return parent->addLocalVar(name, type, scope, function);
-
+    // ### can this happen?
     if (name.isEmpty())
         return true;
 
     if (type != FunctionDefinition) {
         if (formals && formals->containsName(name))
-            return (scope == QQmlJS::AST::VariableScope::Var);
+            return (scope == VariableScope::Var);
     }
     if (!isCatchBlock || name != catchedVariable) {
         MemberMap::iterator it = members.find(name);
@@ -96,6 +93,11 @@ bool Context::addLocalVar(const QString &name, Context::MemberType type, Variabl
             return true;
         }
     }
+
+    // hoist var declarations to the function level
+    if (contextType == ContextType::Block && (scope == VariableScope::Var && type != MemberType::FunctionDefinition))
+        return parent->addLocalVar(name, type, scope, function);
+
     Member m;
     m.type = type;
     m.function = function;