Improve r159256 following Chandler's comments:
Implement UniqueFileContainer::erase(), camelCase, add comment on future optimizations of the cache versus de-optimizations of invalidations.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159997 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp
index 100f3ce..9804105 100644
--- a/lib/Basic/FileManager.cpp
+++ b/lib/Basic/FileManager.cpp
@@ -112,7 +112,7 @@
size_t size() const { return UniqueFiles.size(); }
- friend class FileManager;
+ void erase(const FileEntry *Entry) { UniqueFiles.erase(Entry->getName()); }
};
//===----------------------------------------------------------------------===//
@@ -155,7 +155,7 @@
size_t size() const { return UniqueFiles.size(); }
- friend class FileManager;
+ void erase(const FileEntry *Entry) { UniqueFiles.erase(*Entry); }
};
#endif
@@ -563,16 +563,15 @@
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);
}