gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set FE cache, invalid (=null) FE is a reasonable cached value, too.

Browse Source
This commit is contained in:
Axel Naumann 2014-10-02 16:26:08 +02:00 committed by sftnight
parent fd9f5defab
commit 886396e7c6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Interpreter/AutoloadCallback.cpp
View File

@ -60,7 +60,7 @@ namespace cling {
bool m_IsStoringState;
AutoloadCallback::FwdDeclsMap* m_Map;
clang::Preprocessor* m_PP;
clang::FileEntry* m_PrevFE;
const clang::FileEntry* m_PrevFE;
std::string m_PrevFileName;
private:
void InsertIntoAutoloadingState (Decl* decl, llvm::StringRef annotation) {
@ -78,20 +78,24 @@ namespace cling {
bool isAngled = false;
const DirectoryLookup* LookupFrom = 0;
const DirectoryLookup* CurDir = 0;
if (m_PrevFE && m_PrevFileName == annotation.drop_front(lenAnnoTag))
llvm::StringRef FileName = annotation.drop_front(lenAnnoTag);
if (FileName.equals(m_PrevFileName))
FE = m_PrevFE;
else
FE = m_PP->LookupFile(fileNameLoc,
annotation.drop_front(lenAnnoTag), isAngled,
else {
FE = m_PP->LookupFile(fileNameLoc, FileName, isAngled,
LookupFrom, CurDir, /*SearchPath*/0,
/*RelativePath*/ 0, /*suggestedModule*/0,
/*SkipCache*/false, /*OpenFile*/ false,
/*CacheFail*/ false);
m_PrevFE = FE;
m_PrevFileName = FileName;
}
assert(FE && "Must have a valid FileEntry");
auto& Vec = (*m_Map)[FE];
Vec.push_back(decl);
if (FE) {
auto& Vec = (*m_Map)[FE];
Vec.push_back(decl);
}
}
public: