From 8a2e21eb60dd26c18fd909f44d10431bb7ab7345 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 30 Nov 2010 10:00:33 +0100 Subject: [PATCH] debugger: add a few more asserts --- src/plugins/debugger/breakhandler.cpp | 13 ++----------- src/plugins/debugger/debuggerengine.cpp | 12 +++++++++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 3efb8c621c..f6acc6de7a 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -862,24 +862,15 @@ void BreakHandler::updateLineNumberFromMarker(BreakpointId id, int lineNumber) Iterator it = m_storage.find(id); it->response.pending = false; QTC_ASSERT(it != m_storage.end(), return); - //if (data.markerLineNumber == lineNumber) - // return; if (it->response.lineNumber != lineNumber) { - it->response.lineNumber = lineNumber; // FIXME: Should we tell gdb about the change? - // Ignore it for now, as we would require re-compilation - // and debugger re-start anyway. - //if (0 && data.bpLineNumber) { - // if (!data.bpNumber.trimmed().isEmpty()) { - // data.pending = true; - // } - //} + it->response.lineNumber = lineNumber; } // Ignore updates to the "real" line number while the debugger is // running, as this can be triggered by moving the breakpoint to // the next line that generated code. - // FIXME: Do we need yet another data member? if (it->response.number == 0) { + // FIXME: Do we need yet another data member? it->data.lineNumber = lineNumber; } updateMarker(id); diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 6dc9c22c83..3af3f921da 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1237,18 +1237,24 @@ void DebuggerEngine::attemptBreakpointSynchronization() d->m_disassemblerViewAgent.updateBreakpointMarkers(); } -void DebuggerEngine::insertBreakpoint(BreakpointId) +void DebuggerEngine::insertBreakpoint(BreakpointId id) { + BreakpointState state = breakHandler()->state(id); + QTC_ASSERT(state == BreakpointInsertRequested, qDebug() << state); QTC_ASSERT(false, /**/); } -void DebuggerEngine::removeBreakpoint(BreakpointId) +void DebuggerEngine::removeBreakpoint(BreakpointId id) { + BreakpointState state = breakHandler()->state(id); + QTC_ASSERT(state == BreakpointRemoveRequested, qDebug() << state); QTC_ASSERT(false, /**/); } -void DebuggerEngine::changeBreakpoint(BreakpointId) +void DebuggerEngine::changeBreakpoint(BreakpointId id) { + BreakpointState state = breakHandler()->state(id); + QTC_ASSERT(state == BreakpointChangeRequested, qDebug() << state); QTC_ASSERT(false, /**/); } -- 2.11.0