aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Basic/FileManager.cpp
diff options
context:
space:
mode:
authorAlex Lorenz <arphaman@gmail.com>2021-04-14 11:27:03 -0700
committerAlex Lorenz <arphaman@gmail.com>2021-04-14 11:29:25 -0700
commitc1554f32e3b3fafab64698fdb5b806b1bda4aa8a (patch)
treef63ddf7d21b44596cff02fb5ccd514c304a7ec9b /clang/lib/Basic/FileManager.cpp
parent207d58bf31ab975203c6bb818ee4167a09c195ce (diff)
downloadllvm-c1554f32e3b3fafab64698fdb5b806b1bda4aa8a.zip
llvm-c1554f32e3b3fafab64698fdb5b806b1bda4aa8a.tar.gz
llvm-c1554f32e3b3fafab64698fdb5b806b1bda4aa8a.tar.bz2
[clang][FileManager] Support empty file name in getVirtualFileRef for serialized diagnostics
After https://reviews.llvm.org/D90484 libclang is unable to read a serialized diagnostic file which contains a diagnostic which came from a file with an empty filename. The reason being is that the serialized diagnostic reader is creating a virtual file for the "" filename, which now fails after the changes in https://reviews.llvm.org/D90484. This patch restores the previous behavior in getVirtualFileRef by allowing it to construct a file entry ref with an empty name by pretending its name is "." so that the directory entry can be created. Differential Revision: https://reviews.llvm.org/D100428
Diffstat (limited to 'clang/lib/Basic/FileManager.cpp')
-rw-r--r--clang/lib/Basic/FileManager.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp
index 6e9d5d7..d39d7ba 100644
--- a/clang/lib/Basic/FileManager.cpp
+++ b/clang/lib/Basic/FileManager.cpp
@@ -384,9 +384,12 @@ FileEntryRef FileManager::getVirtualFileRef(StringRef Filename, off_t Size,
// Now that all ancestors of Filename are in the cache, the
// following call is guaranteed to find the DirectoryEntry from the
- // cache.
- auto DirInfo = expectedToOptional(
- getDirectoryFromFile(*this, Filename, /*CacheFailure=*/true));
+ // cache. A virtual file can also have an empty filename, that could come
+ // from a source location preprocessor directive with an empty filename as
+ // an example, so we need to pretend it has a name to ensure a valid directory
+ // entry can be returned.
+ auto DirInfo = expectedToOptional(getDirectoryFromFile(
+ *this, Filename.empty() ? "." : Filename, /*CacheFailure=*/true));
assert(DirInfo &&
"The directory of a virtual file should already be in the cache.");