[clang] Make `FileEntryRef::getDir()` return the as-requested `DirectoryEntryRef`
authorJan Svoboda <jan_svoboda@apple.com>
Thu, 25 May 2023 16:22:38 +0000 (09:22 -0700)
committerJan Svoboda <jan_svoboda@apple.com>
Thu, 25 May 2023 19:36:57 +0000 (12:36 -0700)
commitbdc3ce9e8f8dda42ed286f72094fbbdf0347cbfa
tree8281b4b4734a104889f041d0d4b119fb868c7279
parent9762854538a256d0de38bd413e6d0c29fd2af4f7
[clang] Make `FileEntryRef::getDir()` return the as-requested `DirectoryEntryRef`

For redirected file entries, `FileEntryRef::getDir()` returns the parent directory entry of the target file entry. This differs from `FileEntry::getDir()` that always returns the parent directory that was last used to look up that file.

After switching from `FileEntry` to `FileEntryRef` for umbrella headers in D142113, this discrepancy became observable and caused Clang to emit incorrect diagnostics.

This patch changes Clang so that it always associates `FileEntryRef` with the parent directory that was used to look it up. This brings its behavior closer to `FileEntry`, but without the hacky mutation.

This also ensures that `llvm::sys::path::parent_path(FileRef->getNameAsRequested()) == FileRef->getDir()->getName()`. Previously, `FileRef->getDir()` would fall underneath the redirecting VFS into the world of on-disk paths.

Reviewed By: benlangmuir, rmaz

Differential Revision: https://reviews.llvm.org/D151398
clang/include/clang/Basic/FileEntry.h
clang/lib/Basic/FileManager.cpp
clang/test/Modules/vfs-umbrella-same-dir.m [new file with mode: 0644]
clang/unittests/Basic/FileEntryTest.cpp
clang/unittests/Basic/FileManagerTest.cpp