Set the usesThis flag on the function context

While the old code was also leading to correct results,
it was less efficient, as we would have added the
ConvertThisToObject instruction multiple times (once
for each block that uses 'this'.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index 88fccc548d..9605b72b76 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -568,6 +568,17 @@ void ScanFunctions::calcEscapingVariables()
                 c = c->parent;
             }
         }
+        if (inner->usesThis) {
+            inner->usesThis = false;
+            if (!inner->isStrict) {
+                Context *c = inner;
+                while (c->contextType == ContextType::Block) {
+                    c = c->parent;
+                }
+                Q_ASSERT(c);
+                c->usesThis = true;
+            }
+        }
     }
     for (Context *c : qAsConst(m->contextMap)) {
         if (c->allVarsEscape && c->contextType == ContextType::Block && c->members.isEmpty())