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

Clang: Fix future reporting on backend crash

Browse Source 
...otherwise CppUseSelectionsUpdater might block for an infinite
duration.

Change-Id: I756d82499b0b2864363dcaeff15398a8bf5500d9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-11-27 12:42:47 +01:00
parent 63861c44c1
commit 16ca76d8f5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangcodemodel/clangbackendreceiver.cpp
View File

@@ -140,11 +140,15 @@ void BackendReceiver::reset()
m_assistProcessorsTable.clear(); m_assistProcessorsTable.clear();
// Clean up futures for references // Clean up futures for references
for (ReferencesEntry &entry : m_referencesTable) for (ReferencesEntry &entry : m_referencesTable) {
entry.futureInterface.cancel(); entry.futureInterface.cancel();
entry.futureInterface.reportFinished();
}
m_referencesTable.clear(); m_referencesTable.clear();
for (QFutureInterface<CppTools::SymbolInfo> &futureInterface : m_followTable) for (QFutureInterface<CppTools::SymbolInfo> &futureInterface : m_followTable) {
futureInterface.cancel(); futureInterface.cancel();
futureInterface.reportFinished();
}
m_followTable.clear(); m_followTable.clear();
} }