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

Debugger: fix start and break on main for cdb

Browse Source 
Change-Id: Ifba8ff024b63987f3576caee594cf249f957616d
Fixes: QTCREATORBUG-22263
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2019-05-03 10:58:47 +02:00
parent 56a1b499b5
commit bc51772c1d
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -524,14 +524,17 @@ void CdbEngine::handleInitialSessionIdle()
// QmlCppEngine expects the QML engine to be connected before any breakpoints are hit // QmlCppEngine expects the QML engine to be connected before any breakpoints are hit
// (attemptBreakpointSynchronization() will be directly called then) // (attemptBreakpointSynchronization() will be directly called then)
if (rp.breakOnMain) { if (rp.breakOnMain) {
// FIXME: BreakpointParameters bp(BreakpointAtMain);
// const BreakpointParameters bp(BreakpointAtMain); if (rp.startMode == StartInternal || rp.startMode == StartExternal) {
// BreakpointModelId id(quint16(-1)); const QString &moduleFileName = Utils::FileName::fromString(rp.inferior.executable)
// QString function = cdbAddBreakpointCommand(bp, m_sourcePathMappings, id, true); .fileName();
// runCommand({function, BuiltinCommand, bp.module = moduleFileName.left(moduleFileName.indexOf('.'));
// [this, id](const DebuggerResponse &r) { handleBreakInsert(r, id); }}); }
QString function = cdbAddBreakpointCommand(bp, m_sourcePathMappings);
runCommand({function, BuiltinCommand, [this](const DebuggerResponse &r) {
handleBreakInsert(r, Breakpoint());
}});
} }
// Take ownership of the breakpoint. Requests insertion. TODO: Cpp only? // Take ownership of the breakpoint. Requests insertion. TODO: Cpp only?
BreakpointManager::claimBreakpointsForEngine(this); BreakpointManager::claimBreakpointsForEngine(this);
runCommand({".symopt+0x8000"}); // disable searching public symbol table - improving the symbol lookup speed runCommand({".symopt+0x8000"}); // disable searching public symbol table - improving the symbol lookup speed

2
src/plugins/debugger/cdb/cdbparsehelpers.cpp
View File

@@ -122,6 +122,8 @@ static BreakpointParameters fixWinMSVCBreakpoint(const BreakpointParameters &p)
case BreakpointAtMain: { case BreakpointAtMain: {
BreakpointParameters rc(BreakpointByFunction); BreakpointParameters rc(BreakpointByFunction);
rc.functionName = "main"; rc.functionName = "main";
rc.module = p.module;
rc.oneShot = true;
return rc; return rc;
} }
} // switch } // switch