Fix the bactkrace in the QScript Debugger

This patch remove the 'fake' context  that appears in the debugger
backtrace when there is a break point in the global context.

This problem never appeared in the tests because the
QScriptContext::backtrace has always at least two items in the backtrace
as it needs the native 'bt' function to be called.

Changed QScriptEnginePrivate::contextForFrame to skip the fake frame
(instead of QScriptContext::parentContext). So we never have a QScriptContext
pointing to that frame.

The changes in QScriptContextInfo are for retreiving the right filename
information for the global context when the global context is on top.

Reviewed-by: Kent Hansen

1 files changed, 1 insertions, 6 deletions

diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index 7a09d91..2ca6d26 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -374,12 +374,7 @@ QScriptContext *QScriptContext::parentContext() const
 {
     const JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
     JSC::CallFrame *callerFrame = frame->callerFrame()->removeHostCallFrameFlag();
-    if (callerFrame && callerFrame->callerFrame()->hasHostCallFrameFlag()
-        && callerFrame->callerFrame()->removeHostCallFrameFlag() == QScript::scriptEngineFromExec(frame)->globalExec()) {
-        //skip the "fake" context created in Interpreter::execute.
-        callerFrame = callerFrame->callerFrame()->removeHostCallFrameFlag();
-    }
-    return reinterpret_cast<QScriptContext *>(callerFrame);
+    return QScriptEnginePrivate::contextForFrame(callerFrame);
 }
 
 /*!