maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Improve r159256 following Chandler's comments: 

Implement UniqueFileContainer::erase(), camelCase, add comment on future optimizations of the cache versus de-optimizations of invalidations.

llvm-svn: 159997
This commit is contained in:
Axel Naumann 2012-07-10 16:50:27 +00:00
parent 8698dd63d7
commit b307400326
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/FileManager.h
View File

@ -232,7 +232,7 @@ public:
bool getNoncachedStatValue(StringRef Path, struct stat &StatBuf);
/// \brief Remove the real file \p Entry from the cache.
void InvalidateCache(const FileEntry* Entry);
void invalidateCache(const FileEntry *Entry);
/// \brief If path is not absolute and FileSystemOptions set the working
/// directory, the path is modified to be relative to the given

19
clang/lib/Basic/FileManager.cpp
View File

@ -112,7 +112,7 @@ public:
size_t size() const { return UniqueFiles.size(); }
friend class FileManager;
void erase(const FileEntry *Entry) { UniqueFiles.erase(Entry->getName()); }
};
//===----------------------------------------------------------------------===//
@ -155,7 +155,7 @@ public:
size_t size() const { return UniqueFiles.size(); }
friend class FileManager;
void erase(const FileEntry *Entry) { UniqueFiles.erase(*Entry); }
};
#endif
@ -563,16 +563,15 @@ bool FileManager::getNoncachedStatValue(StringRef Path,
return ::stat(FilePath.c_str(), &StatBuf) != 0;
}
void FileManager::InvalidateCache(const FileEntry* Entry) {
if (!Entry)
return;
void FileManager::invalidateCache(const FileEntry *Entry) {
assert(Entry && "Cannot invalidate a NULL FileEntry");
SeenFileEntries.erase(Entry->getName());
#ifdef LLVM_ON_WIN32
UniqueRealFiles.UniqueFiles.erase(Entry->getName());
#else
UniqueRealFiles.UniqueFiles.erase(*Entry);
#endif
// FileEntry invalidation should not block future optimizations in the file
// caches. Possible alternatives are cache truncation (invalidate last N) or
// invalidation of the whole cache.
UniqueRealFiles.erase(Entry);
}