Cleanup usage of ExecutionEngine::currentContext

Change-Id: Ic79d6da162375928ec25871cd0341daeab6483d2
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 91c0d2da2d..5fcaa6265e 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -341,8 +341,8 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
     Scope scope(v4);
     ExecutionContextSaver ctxSaver(scope);
 
-    ScopedContext parentContext(scope, v4->currentContext());
-    ScopedContext ctx(scope, parentContext.getPointer());
+    ExecutionContext *currentContext = v4->currentExecutionContext;
+    ExecutionContext *ctx = currentContext;
 
     if (!directCall) {
         // the context for eval should be the global scope, so we fake a root
@@ -357,10 +357,10 @@ ReturnedValue EvalFunction::evalCall(CallData *callData, bool directCall) const
     bool inheritContext = !ctx->d()->strictMode;
 
     Script script(ctx, code, QStringLiteral("eval code"));
-    script.strictMode = (directCall && parentContext->d()->strictMode);
+    script.strictMode = (directCall && currentContext->d()->strictMode);
     script.inheritContext = inheritContext;
     script.parse();
-    if (scope.engine->hasException)
+    if (v4->hasException)
         return Encode::undefined();
 
     Function *function = script.function();