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

Clang: Improve caching of file path ids

Browse Source 
Clang is internally using an id to handle files. We add now a mapping from
their AST local id to out global id.

Change-Id: I2d724761287b5e915237175134ec5d3b92099ddb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-08-24 18:30:06 +02:00
parent efcfb5ee15
commit 5ad44318eb
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/clangrefactoringbackend/source/collectsymbolsastvisitor.h
View File

@@ -94,9 +94,20 @@ public:
FilePathIndex filePathId(clang::SourceLocation sourceLocation)
{
auto filePath = m_sourceManager.getFilename(sourceLocation);
uint clangFileId = m_sourceManager.getFileID(sourceLocation).getHashValue();
return m_filePathCache.stringId(toStringView(filePath));
auto found = m_filePathIndices.find(clangFileId);
if (found != m_filePathIndices.end())
return found->second;
auto filePath = m_sourceManager.getFilename(sourceLocation);
FilePathIndex index = m_filePathCache.stringId(toStringView(filePath));
m_filePathIndices.emplace(clangFileId, index);
return index;
}
LineColumn lineColum(clang::SourceLocation sourceLocation)
@@ -121,6 +132,7 @@ public:
private:
SymbolEntries &m_symbolEntries;
std::unordered_map<uint, FilePathIndex> m_filePathIndices;
SourceLocationEntries &m_sourceLocationEntries;
FilePathCache<> &m_filePathCache;
const clang::SourceManager &m_sourceManager;