1 files changed, 14 insertions, 24 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index 80ead1516a..45af1f44a5 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -63,26 +63,20 @@ void JavaScriptJob::run()
 {
     QV4::Scope scope(engine);
 
-    QV4::ExecutionContextSaver saver(engine);
-
-    QV4::ExecutionContext *ctx = engine->currentContext;
+    QV4::ScopedContext ctx(scope, engine->currentContext());
     QObject scopeObject;
 
     if (frameNr > 0) {
-        for (int i = 0; i < frameNr; ++i) {
-            ctx = engine->parentContext(ctx);
-        }
-        engine->pushContext(ctx);
-        ctx = engine->currentContext;
+        QV4::EngineBase::StackFrame *f = engine->currentStackFrame;
+        for (int i = 0; i < frameNr; ++i)
+            f = f->parent;
+        ctx = static_cast<QV4::ExecutionContext *>(&f->jsFrame->context);
     }
 
     if (context >= 0) {
         QQmlContext *extraContext = qmlContext(QQmlDebugService::objectForId(context));
-        if (extraContext) {
-            engine->pushContext(QV4::QmlContext::create(ctx, QQmlContextData::get(extraContext),
-                                                        &scopeObject));
-            ctx = engine->currentContext;
-        }
+        if (extraContext)
+            ctx = QV4::QmlContext::create(ctx, QQmlContextData::get(extraContext), &scopeObject);
     } else if (frameNr < 0) { // Use QML context if available
         QQmlEngine *qmlEngine = engine->qmlEngine();
         if (qmlEngine) {
@@ -102,13 +96,8 @@ void JavaScriptJob::run()
                     }
                 }
             }
-            if (!engine->qmlContext()) {
-                engine->pushContext(QV4::QmlContext::create(ctx, QQmlContextData::get(qmlRootContext),
-                                                       &scopeObject));
-                ctx = engine->currentContext;
-            }
-            engine->pushContext(ctx->newWithContext(withContext->toObject(engine)));
-            ctx = engine->currentContext;
+            if (!engine->qmlContext())
+                ctx = QV4::QmlContext::create(ctx, QQmlContextData::get(qmlRootContext), &scopeObject);
         }
     }
 
@@ -214,12 +203,15 @@ void ValueLookupJob::run()
     // set if the engine is currently executing QML code.
     QScopedPointer<QObject> scopeObject;
     QV4::ExecutionEngine *engine = collector->engine();
+    QV4::Scope scope(engine);
+    QV4::Heap::ExecutionContext *qmlContext = 0;
     if (engine->qmlEngine() && !engine->qmlContext()) {
         scopeObject.reset(new QObject);
-        engine->pushContext(QV4::QmlContext::create(engine->currentContext,
+        qmlContext = QV4::QmlContext::create(engine->currentContext(),
                                 QQmlContextData::get(engine->qmlEngine()->rootContext()),
-                                scopeObject.data()));
+                                scopeObject.data());
     }
+    QV4::ScopedStackFrame frame(scope, qmlContext);
     for (const QJsonValue &handle : handles) {
         QV4DataCollector::Ref ref = handle.toInt();
         if (!collector->isValidRef(ref)) {
@@ -229,8 +221,6 @@ void ValueLookupJob::run()
         result[QString::number(ref)] = collector->lookupRef(ref, true);
     }
     flushRedundantRefs();
-    if (scopeObject)
-        engine->popContext();
 }
 
 const QString &ValueLookupJob::exceptionMessage() const