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

Use the canonical paths to the files/libraries to unload.

Browse Source
This commit is contained in:
Vassil Vassilev 2014-04-10 19:10:42 +02:00 committed by sftnight
parent 0abad4f1ff
commit 5b49009ec8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/MetaProcessor/MetaSema.cpp
View File

@ -47,11 +47,12 @@ namespace cling {
// loading of the file and revert exclusively if needed.
const Transaction* unloadPoint = m_Interpreter.getLastTransaction();
// TODO: extra checks. Eg if the path is readable, if the file exists...
std::string canFile = m_Interpreter.lookupFileOrLibrary(file);
if (m_Interpreter.loadFile(file.str()) == Interpreter::kSuccess) {
clang::SourceManager& SM = m_Interpreter.getSema().getSourceManager();
clang::FileManager& FM = SM.getFileManager();
const clang::FileEntry* Entry
= FM.getFile(file, /*OpenFile*/false, /*CacheFailure*/false);
= FM.getFile(canFile, /*OpenFile*/false, /*CacheFailure*/false);
if (Entry && !m_Watermarks[Entry]) // register as a watermark
m_Watermarks[Entry] = unloadPoint;
@ -108,8 +109,11 @@ namespace cling {
// Lookup the file
clang::SourceManager& SM = m_Interpreter.getSema().getSourceManager();
clang::FileManager& FM = SM.getFileManager();
//Get the canonical path, taking into account interp and system search paths
std::string canonicalFile = m_Interpreter.lookupFileOrLibrary(file);
const clang::FileEntry* Entry
= FM.getFile(file, /*OpenFile*/false, /*CacheFailure*/false);
= FM.getFile(canonicalFile, /*OpenFile*/false, /*CacheFailure*/false);
if (Entry) {
Watermarks::iterator Pos = m_Watermarks.find(Entry);
if (Pos != m_Watermarks.end()) {