feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: fix gotoLocation() on Mac

Browse Source 
Mac's "stopped" message does not come with location data.
This commit is contained in:
hjk
2009-10-02 14:31:38 +02:00
parent 7e005752a7
commit 5a73440b18
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -2296,12 +2296,21 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
theDebuggerAction(ExpandStack)->setEnabled(canExpand);
manager()->stackHandler()->setFrames(stackFrames, canExpand);
if (topFrame != -1 && topFrame != 0
&& !theDebuggerBoolSetting(OperateByInstruction)) {
// For topFrame == -1 there is no frame at all, for topFrame == 0
// we already issued a 'gotoLocation' when reading the *stopped
// message. Also, when OperateByInstruction we always want to
// use frame #0.
#ifdef Q_OS_MAC
// Mac gdb does not add the location to the "stopped" message,
// so the early gotoLocation() was not triggered. Force it here.
bool jump = topFrame != -1
&& !theDebuggerBoolSetting(OperateByInstruction);
#else
// For topFrame == -1 there is no frame at all, for topFrame == 0
// we already issued a 'gotoLocation' when reading the *stopped
// message. Also, when OperateByInstruction we always want to
// use frame #0.
bool jump = topFrame != -1 && topFrame != 0
&& !theDebuggerBoolSetting(OperateByInstruction);
#endif
if (jump) {
const StackFrame &frame = manager()->stackHandler()->currentFrame();
qDebug() << "GOTO, 2nd try" << frame.toString() << topFrame;
gotoLocation(frame, true);