aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Frontend/FrontendAction.cpp
diff options
context:
space:
mode:
authorJan Svoboda <jan_svoboda@apple.com>2023-05-31 14:53:11 -0700
committerJan Svoboda <jan_svoboda@apple.com>2023-06-15 12:34:54 +0200
commitfa5788ff8dc10f36e0947757e335cd180a1a63c9 (patch)
treefbf8546f17263e3655ed5bc9310f1385daa0b5f1 /clang/lib/Frontend/FrontendAction.cpp
parented27d28f9a53d689c98a3bef26980e2858350548 (diff)
downloadllvm-fa5788ff8dc10f36e0947757e335cd180a1a63c9.zip
llvm-fa5788ff8dc10f36e0947757e335cd180a1a63c9.tar.gz
llvm-fa5788ff8dc10f36e0947757e335cd180a1a63c9.tar.bz2
[clang][index] NFCI: Make `CXFile` a `FileEntryRef`
This patch swaps out the `void *` behind `CXFile` from `FileEntry *` to `FileEntryRef::MapEntry *`. This allows us to remove some deprecated uses of `FileEntry::getName()`. Depends on D151854. Reviewed By: benlangmuir Differential Revision: https://reviews.llvm.org/D151938
Diffstat (limited to 'clang/lib/Frontend/FrontendAction.cpp')
-rw-r--r--clang/lib/Frontend/FrontendAction.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp
index cfac2f8..c6f958a 100644
--- a/clang/lib/Frontend/FrontendAction.cpp
+++ b/clang/lib/Frontend/FrontendAction.cpp
@@ -379,9 +379,7 @@ static std::error_code collectModuleHeaderIncludes(
llvm::sys::path::native(UmbrellaDir->Entry.getName(), DirNative);
llvm::vfs::FileSystem &FS = FileMgr.getVirtualFileSystem();
- SmallVector<
- std::pair<std::string, OptionalFileEntryRefDegradesToFileEntryPtr>, 8>
- Headers;
+ SmallVector<std::pair<std::string, FileEntryRef>, 8> Headers;
for (llvm::vfs::recursive_directory_iterator Dir(FS, DirNative, EC), End;
Dir != End && !EC; Dir.increment(EC)) {
// Check whether this entry has an extension typically associated with