Fix frame handling

Fix some regressions introduced by change
1ae1eaf59e0475a2dc9c5e22e53e9be19d0f2feb.

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

3 files changed, 32 insertions, 33 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
index b82df9c6a9..1bd8581fbb 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
@@ -158,7 +158,7 @@ QV4Debugger::ExecutionState QV4Debugger::currentExecutionState() const
 {
     ExecutionState state;
     state.fileName = getFunction()->sourceFile();
-    state.lineNumber = engine()->current->lineNumber;
+    state.lineNumber = engine()->currentStackFrame->line;
 
     return state;
 }
@@ -203,7 +203,7 @@ void QV4Debugger::maybeBreakAtInstruction()
         pauseAndWait(PauseRequest);
     } else if (m_haveBreakPoints) {
         if (QV4::Function *f = getFunction()) {
-            const int lineNumber = engine()->current->lineNumber;
+            const int lineNumber = engine()->currentStackFrame->line;
             if (reallyHitTheBreakPoint(f->sourceFile(), lineNumber))
                 pauseAndWait(BreakPointHit);
         }
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
index 9a34d5770a..09ed9ac98c 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
@@ -79,20 +79,19 @@ void QV4DebuggerAgent::debuggerPaused(QV4Debugger *debugger, QV4Debugger::PauseR
     case QV4Debugger::PauseRequest:
     case QV4Debugger::BreakPointHit: {
         event.insert(QStringLiteral("event"), QStringLiteral("break"));
-        QVector<QV4::StackFrame> frames = debugger->stackTrace(1);
-        if (frames.isEmpty())
+        QV4::EngineBase::StackFrame *frame = debugger->engine()->currentStackFrame;
+        if (!frame)
             break;
 
-        const QV4::StackFrame &topFrame = frames.first();
-        body.insert(QStringLiteral("invocationText"), topFrame.function);
-        body.insert(QStringLiteral("sourceLine"), topFrame.line - 1);
-        if (topFrame.column > 0)
-            body.insert(QStringLiteral("sourceColumn"), topFrame.column);
+        body.insert(QStringLiteral("invocationText"), frame->function());
+        body.insert(QStringLiteral("sourceLine"), frame->line - 1);
+        if (frame->column > 0)
+            body.insert(QStringLiteral("sourceColumn"), frame->column);
         QJsonArray breakPoints;
-        foreach (int breakPointId, breakPointIds(topFrame.source, topFrame.line))
+        foreach (int breakPointId, breakPointIds(frame->source(), frame->line))
             breakPoints.push_back(breakPointId);
         body.insert(QStringLiteral("breakpoints"), breakPoints);
-        script.insert(QStringLiteral("name"), topFrame.source);
+        script.insert(QStringLiteral("name"), frame->source());
     } break;
     case QV4Debugger::Throwing:
         // TODO: complete this!
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
index 59d4687615..cbf4eb1539 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
@@ -239,7 +239,9 @@ private:
 
 bool NativeDebugger::checkCondition(const QString &expression)
 {
-    return evaluateExpression(expression).booleanValue();
+    QV4::Scope scope(m_engine);
+    QV4::ScopedValue r(scope, evaluateExpression(expression));
+    return r->booleanValue();
 }
 
 QV4::ReturnedValue NativeDebugger::evaluateExpression(const QString &expression)
@@ -333,25 +335,24 @@ void NativeDebugger::handleBacktrace(QJsonObject *response, const QJsonObject &a
     int limit = arguments.value(QLatin1String("limit")).toInt(0);
 
     QJsonArray frameArray;
-    QV4::ExecutionContext *executionContext = m_engine->currentContext;
-    for (int i  = 0; i < limit && executionContext; ++i) {
-        if (QV4::Function *function = executionContext->getFunction()) {
+    QV4::EngineBase::StackFrame *f= m_engine->currentStackFrame;
+    for (int i  = 0; i < limit && f; ++i) {
+        QV4::Function *function = f->v4Function;
 
-            QJsonObject frame;
-            frame.insert(QStringLiteral("language"), QStringLiteral("js"));
-            frame.insert(QStringLiteral("context"), encodeContext(executionContext));
+        QJsonObject frame;
+        frame.insert(QStringLiteral("language"), QStringLiteral("js"));
+        frame.insert(QStringLiteral("context"), encodeContext(nullptr /*####  context*/));
 
-            if (QV4::Heap::String *functionName = function->name())
-                frame.insert(QStringLiteral("function"), functionName->toQString());
-            frame.insert(QStringLiteral("file"), function->sourceFile());
+        if (QV4::Heap::String *functionName = function->name())
+            frame.insert(QStringLiteral("function"), functionName->toQString());
+        frame.insert(QStringLiteral("file"), function->sourceFile());
 
-            int line = executionContext->d()->lineNumber;
-            frame.insert(QStringLiteral("line"), (line < 0 ? -line : line));
+        int line = f->line;
+        frame.insert(QStringLiteral("line"), (line < 0 ? -line : line));
 
-            frameArray.push_back(frame);
-        }
+        frameArray.push_back(frame);
 
-        executionContext = m_engine->parentContext(executionContext);
+        f = f->parent;
     }
 
     response->insert(QStringLiteral("frames"), frameArray);
@@ -621,7 +622,7 @@ void NativeDebugger::maybeBreakAtInstruction()
 
     if (m_service->m_breakHandler->m_haveBreakPoints) {
         if (QV4::Function *function = getFunction()) {
-            const int lineNumber = m_engine->current->lineNumber;
+            const int lineNumber = m_engine->currentStackFrame->line;
             if (reallyHitTheBreakPoint(function, lineNumber))
                 pauseAndWait();
         }
@@ -679,12 +680,11 @@ void NativeDebugger::pauseAndWait()
 
     event.insert(QStringLiteral("event"), QStringLiteral("break"));
     event.insert(QStringLiteral("language"), QStringLiteral("js"));
-    if (QV4::ExecutionContext *executionContext = m_engine->currentContext) {
-        if (QV4::Function *function = executionContext->getFunction()) {
-            event.insert(QStringLiteral("file"), function->sourceFile());
-            int line = executionContext->d()->lineNumber;
-            event.insert(QStringLiteral("line"), (line < 0 ? -line : line));
-        }
+    if (QV4::EngineBase::StackFrame *frame = m_engine->currentStackFrame) {
+        QV4::Function *function = frame->v4Function;
+        event.insert(QStringLiteral("file"), function->sourceFile());
+        int line = frame->line;
+        event.insert(QStringLiteral("line"), (line < 0 ? -line : line));
     }
 
     m_service->emitAsynchronousMessageToClient(event);