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

Debugger: Move cpp snapshot storage to cdbengine

Browse Source 
It's the only one using it.

Change-Id: I95dc4918c82653710a47cb8d0043bb3241e954ac
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2018-05-25 15:28:52 +02:00
parent db1174b6b8
commit 94d41afade
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,6 +243,9 @@ CdbEngine::CdbEngine() :
this, &CdbEngine::readyReadStandardOut);
connect(action(UseDebuggingHelpers), &SavedAction::valueChanged,
this, &CdbEngine::updateLocals);
if (action(UseCodeModel)->isChecked())
m_codeModelSnapshot = CppTools::CppModelManager::instance()->snapshot();
}
void CdbEngine::init()
@@ -1166,7 +1169,7 @@ void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
if (boolSetting(UseCodeModel)) {
QStringList uninitializedVariables;
getUninitializedVariables(Internal::cppCodeModelSnapshot(),
getUninitializedVariables(m_codeModelSnapshot,
frame.function, frame.file, frame.line, &uninitializedVariables);
cmd.arg("uninitialized", uninitializedVariables);
}
@@ -1237,7 +1240,7 @@ void CdbEngine::doUpdateLocals(const UpdateParameters &updateParameters)
// variables in case of errors in uninitializedVariables().
if (boolSetting(UseCodeModel)) {
QStringList uninitializedVariables;
getUninitializedVariables(Internal::cppCodeModelSnapshot(),
getUninitializedVariables(m_codeModelSnapshot,
frame.function, frame.file, frame.line, &uninitializedVariables);
if (!uninitializedVariables.isEmpty()) {
str << blankSeparator << "-u \"";
@@ -2634,7 +2637,7 @@ void CdbEngine::attemptBreakpointSynchronization()
&& parameters.type == BreakpointByFileAndLine
&& boolSetting(CdbBreakPointCorrection)) {
if (lineCorrection.isNull())
lineCorrection.reset(new BreakpointCorrectionContext(Internal::cppCodeModelSnapshot(),
lineCorrection.reset(new BreakpointCorrectionContext(m_codeModelSnapshot,
CppTools::CppModelManager::instance()->workingCopy()));
response.lineNumber = lineCorrection->fixLineNumber(parameters.fileName, parameters.lineNumber);
QString cmd = cdbAddBreakpointCommand(response, m_sourcePathMappings, id, false);