[clang] NFCI: Use DirectoryEntryRef in Module::Directory
This patch changes the type of `Module::Directory` from `const DirectoryEntry *` to (essentially) `Optional<DirectoryEntryRef>` in order to remove uses of the deprecated `DirectoryEntry::getName()`.
Depends on D127651.
Reviewed By: bnbarham
Differential Revision: https://reviews.llvm.org/D127654
GitOrigin-RevId: 32d6f3cfd90b90321e84477b2bd353afbf9876ea
diff --git a/include/clang/Basic/Module.h b/include/clang/Basic/Module.h
index 128e2ad..3ecab42 100644
--- a/include/clang/Basic/Module.h
+++ b/include/clang/Basic/Module.h
@@ -149,7 +149,7 @@
/// The build directory of this module. This is the directory in
/// which the module is notionally built, and relative to which its headers
/// are found.
- const DirectoryEntry *Directory = nullptr;
+ OptionalDirectoryEntryRefDegradesToDirectoryEntryPtr Directory;
/// The presumed file name for the module map defining this module.
/// Only non-empty when building from preprocessed source.
diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp
index 833287c..6808fdf 100644
--- a/lib/Lex/ModuleMap.cpp
+++ b/lib/Lex/ModuleMap.cpp
@@ -181,7 +181,7 @@
Module *M, const Module::UnresolvedHeaderDirective &Header,
SmallVectorImpl<char> &RelativePathName, bool &NeedsFramework) {
// Search for the header file within the module's home directory.
- auto *Directory = M->Directory;
+ auto Directory = M->Directory;
SmallString<128> FullPathName(Directory->getName());
auto GetFile = [&](StringRef Filename) -> OptionalFileEntryRef {
