diff options
| -rw-r--r-- | clang/lib/Basic/FileManager.cpp | 9 | ||||
| -rw-r--r-- | clang/test/Misc/serialized-diags-empty-filename.c | 8 |
2 files changed, 14 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."); diff --git a/clang/test/Misc/serialized-diags-empty-filename.c b/clang/test/Misc/serialized-diags-empty-filename.c new file mode 100644 index 0000000..e861084 --- /dev/null +++ b/clang/test/Misc/serialized-diags-empty-filename.c @@ -0,0 +1,8 @@ +// RUN: rm -f %t.diag +// RUN: not %clang -c %s --serialize-diagnostics %t.diag +// RUN: c-index-test -read-diagnostics %t.diag 2>&1 | FileCheck %s + +# 1 "" 1 +void 1(); + +// CHECK: :1:6: error: |