Properly calculate escaping variables

Change-Id: Ia9f0b6d3f31bd3a7bd4316ee3f3e9ff977f973b7
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/compiler/qv4compilercontext_p.h b/src/qml/compiler/qv4compilercontext_p.h
index a924d087c0..87202089c5 100644
--- a/src/qml/compiler/qv4compilercontext_p.h
+++ b/src/qml/compiler/qv4compilercontext_p.h
@@ -123,6 +123,7 @@ struct Context {
     typedef QMap<QString, Member> MemberMap;
 
     MemberMap members;
+    QSet<QString> usedVariables;
     QQmlJS::AST::FormalParameterList *formals = 0;
     QStringList arguments;
     QStringList locals;
@@ -216,26 +217,21 @@ struct Context {
                usesArgumentsObject == ArgumentsObjectNotUsed && !hasDirectEval;
     }
 
-    int findArgument(const QString &name, bool canEscape)
+    int findArgument(const QString &name)
     {
         // search backwards to handle duplicate argument names correctly
         for (int i = arguments.size() - 1; i >= 0; --i) {
-            if (arguments.at(i) == name) {
-                if (canEscape)
-                    argumentsCanEscape = true;
+            if (arguments.at(i) == name)
                 return i;
-            }
         }
         return -1;
     }
 
-    int findMember(const QString &name, bool canEscape) const
+    int findMember(const QString &name) const
     {
         MemberMap::const_iterator it = members.find(name);
         if (it == members.end())
             return -1;
-        if (canEscape)
-            (*it).canEscape = true;
         Q_ASSERT((*it).index != -1 || !parent);
         return (*it).index;
     }
@@ -252,6 +248,10 @@ struct Context {
         return true;
     }
 
+    void addUsedVariable(const QString &name) {
+        usedVariables.insert(name);
+    }
+
     void addLocalVar(const QString &name, MemberType type, QQmlJS::AST::VariableDeclaration::VariableScope scope, QQmlJS::AST::FunctionExpression *function = 0)
     {
         if (! name.isEmpty()) {