Correctly instantiate variables in the local scope

This fixes cases where eval() would create variables
in the wrong scope.

Change-Id: Ie93ec2d1fb125e588c1b6ffa2ca8ca4b6e3112c9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/qv4isel_masm.cpp b/qv4isel_masm.cpp
index f39c3b75b1..a0262c8079 100644
--- a/qv4isel_masm.cpp
+++ b/qv4isel_masm.cpp
@@ -279,6 +279,18 @@ void InstructionSelection::callActivationProperty(IR::Call *call, IR::Temp *resu
     case IR::Name::builtin_pop_with:
         generateFunctionCall(Void, __qmljs_builtin_pop_with, ContextRegister);
         break;
+    case IR::Name::builtin_declare_vars: {
+        if (!call->args)
+            return;
+        IR::Const *deletable = call->args->expr->asConst();
+        assert(deletable->type == IR::BoolType);
+        for (IR::ExprList *it = call->args->next; it; it = it->next) {
+            IR::Name *arg = it->expr->asName();
+            assert(arg != 0);
+            generateFunctionCall(Void, __qmljs_builtin_declare_var, ContextRegister,
+                                 TrustedImm32(deletable->value != 0), identifier(*arg->id));
+        }
+    }
     }
 }