jansvoboda11 created this revision.
jansvoboda11 added reviewers: benlangmuir, bnbarham.
Herald added a subscriber: ributzka.
Herald added a project: All.
jansvoboda11 requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This removes some deprecated uses of `DirectoryEntry::getName()`.
Depends on D151581 <https://reviews.llvm.org/D151581>.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D151584
Files:
clang/include/clang/Basic/Module.h
clang/include/clang/Lex/ModuleMap.h
clang/lib/Basic/Module.cpp
clang/lib/Lex/ModuleMap.cpp
clang/lib/Lex/PPLexerChange.cpp
clang/lib/Serialization/ASTReader.cpp
Index: clang/lib/Serialization/ASTReader.cpp
===================================================================
--- clang/lib/Serialization/ASTReader.cpp
+++ clang/lib/Serialization/ASTReader.cpp
@@ -5750,7 +5750,8 @@
// See comments in SUBMODULE_UMBRELLA_HEADER
std::string Dirname = std::string(Blob);
ResolveImportedPath(F, Dirname);
- if (auto Umbrella = PP.getFileManager().getDirectory(Dirname)) {
+ if (auto Umbrella =
+ PP.getFileManager().getOptionalDirectoryRef(Dirname)) {
if (!CurrentModule->getWrittenUmbrellaDir()) {
// FIXME: NameAsWritten
ModMap.setWrittenUmbrellaDir(CurrentModule, *Umbrella, Blob, "");
Index: clang/lib/Lex/PPLexerChange.cpp
===================================================================
--- clang/lib/Lex/PPLexerChange.cpp
+++ clang/lib/Lex/PPLexerChange.cpp
@@ -298,7 +298,7 @@
return;
ModuleMap &ModMap = getHeaderSearchInfo().getModuleMap();
- const DirectoryEntry *Dir = Mod.getEffectiveUmbrellaDir();
+ OptionalDirectoryEntryRef Dir = Mod.getEffectiveUmbrellaDir();
llvm::vfs::FileSystem &FS = FileMgr.getVirtualFileSystem();
std::error_code EC;
for (llvm::vfs::recursive_directory_iterator Entry(FS, Dir->getName(), EC),
@@ -318,7 +318,7 @@
if (!ModMap.isHeaderInUnavailableModule(*Header)) {
// Find the relative path that would access this header.
SmallString<128> RelativePath;
- computeRelativePath(FileMgr, Dir, *Header, RelativePath);
+ computeRelativePath(FileMgr, *Dir, *Header, RelativePath);
Diag(ExpectedHeadersLoc, diag::warn_uncovered_module_header)
<< Mod.getFullModuleName() << RelativePath;
}
Index: clang/lib/Lex/ModuleMap.cpp
===================================================================
--- clang/lib/Lex/ModuleMap.cpp
+++ clang/lib/Lex/ModuleMap.cpp
@@ -1186,9 +1186,9 @@
}
void ModuleMap::setWrittenUmbrellaDir(
- Module *Mod, const DirectoryEntry *UmbrellaDir, const Twine &NameAsWritten,
+ Module *Mod, DirectoryEntryRef UmbrellaDir, const Twine &NameAsWritten,
const Twine &PathRelativeToRootModuleDirectory) {
- Mod->Umbrella = UmbrellaDir;
+ Mod->Umbrella = &UmbrellaDir.getMapEntry();
Mod->UmbrellaAsWritten = NameAsWritten.str();
Mod->UmbrellaRelativeToRootModuleDirectory =
PathRelativeToRootModuleDirectory.str();
@@ -2515,16 +2515,14 @@
}
// Look for this file.
- const DirectoryEntry *Dir = nullptr;
+ OptionalDirectoryEntryRef Dir;
if (llvm::sys::path::is_absolute(DirName)) {
- if (auto D = SourceMgr.getFileManager().getDirectory(DirName))
- Dir = *D;
+ Dir = SourceMgr.getFileManager().getOptionalDirectoryRef(DirName);
} else {
SmallString<128> PathName;
PathName = Directory->getName();
llvm::sys::path::append(PathName, DirName);
- if (auto D = SourceMgr.getFileManager().getDirectory(PathName))
- Dir = *D;
+ Dir = SourceMgr.getFileManager().getOptionalDirectoryRef(PathName);
}
if (!Dir) {
@@ -2558,7 +2556,7 @@
return;
}
- if (Module *OwningModule = Map.UmbrellaDirs[Dir]) {
+ if (Module *OwningModule = Map.UmbrellaDirs[*Dir]) {
Diags.Report(UmbrellaLoc, diag::err_mmap_umbrella_clash)
<< OwningModule->getFullModuleName();
HadError = true;
@@ -2566,7 +2564,7 @@
}
// Record this umbrella directory.
- Map.setWrittenUmbrellaDir(ActiveModule, Dir, DirNameAsWritten, DirName);
+ Map.setWrittenUmbrellaDir(ActiveModule, *Dir, DirNameAsWritten, DirName);
}
/// Parse a module export declaration.
Index: clang/lib/Basic/Module.cpp
===================================================================
--- clang/lib/Basic/Module.cpp
+++ clang/lib/Basic/Module.cpp
@@ -263,12 +263,12 @@
return nameParts.empty();
}
-const DirectoryEntry *Module::getEffectiveUmbrellaDir() const {
+OptionalDirectoryEntryRef Module::getEffectiveUmbrellaDir() const {
if (const auto *ME = Umbrella.dyn_cast<const FileEntryRef::MapEntry *>())
return FileEntryRef(*ME).getDir();
- if (const auto *ME = Umbrella.dyn_cast<const DirectoryEntry *>())
- return ME;
- return nullptr;
+ if (const auto *ME = Umbrella.dyn_cast<const DirectoryEntryRef::MapEntry *>())
+ return DirectoryEntryRef(*ME);
+ return std::nullopt;
}
void Module::addTopHeader(const FileEntry *File) {
Index: clang/include/clang/Lex/ModuleMap.h
===================================================================
--- clang/include/clang/Lex/ModuleMap.h
+++ clang/include/clang/Lex/ModuleMap.h
@@ -698,7 +698,7 @@
const Twine &PathRelativeToRootModuleDirectory);
/// Sets the umbrella directory of the given module to the given directory.
- void setWrittenUmbrellaDir(Module *Mod, const DirectoryEntry *UmbrellaDir,
+ void setWrittenUmbrellaDir(Module *Mod, DirectoryEntryRef UmbrellaDir,
const Twine &NameAsWritten,
const Twine &PathRelativeToRootModuleDirectory);
Index: clang/include/clang/Basic/Module.h
===================================================================
--- clang/include/clang/Basic/Module.h
+++ clang/include/clang/Basic/Module.h
@@ -156,7 +156,8 @@
std::string PresumedModuleMapFile;
/// The umbrella header or directory.
- llvm::PointerUnion<const FileEntryRef::MapEntry *, const DirectoryEntry *>
+ llvm::PointerUnion<const FileEntryRef::MapEntry *,
+ const DirectoryEntryRef::MapEntry *>
Umbrella;
/// The module signature.
@@ -252,9 +253,9 @@
struct DirectoryName {
std::string NameAsWritten;
std::string PathRelativeToRootModuleDirectory;
- const DirectoryEntry *Entry;
+ OptionalDirectoryEntryRef Entry;
- explicit operator bool() { return Entry; }
+ explicit operator bool() { return Entry.has_value(); }
};
/// The headers that are part of this module.
@@ -653,9 +654,11 @@
/// Retrieve the explicitly written umbrella directory for this module.
DirectoryName getWrittenUmbrellaDir() const {
- if (const auto *ME = Umbrella.dyn_cast<const DirectoryEntry *>())
+ if (const auto *ME =
+ Umbrella.dyn_cast<const DirectoryEntryRef::MapEntry *>())
return DirectoryName{UmbrellaAsWritten,
- UmbrellaRelativeToRootModuleDirectory, ME};
+ UmbrellaRelativeToRootModuleDirectory,
+ DirectoryEntryRef(*ME)};
return DirectoryName{};
}
@@ -670,13 +673,7 @@
/// Get the effective umbrella directory for this module: either the one
/// explicitly written in the module map file, or the parent of the umbrella
/// header.
- const DirectoryEntry *getEffectiveUmbrellaDir() const;
-
- /// Determine whether this module has an umbrella directory that is
- /// not based on an umbrella header.
- bool hasUmbrellaDir() const {
- return Umbrella && Umbrella.is<const DirectoryEntry *>();
- }
+ OptionalDirectoryEntryRef getEffectiveUmbrellaDir() const;
/// Add a top-level header associated with this module.
void addTopHeader(const FileEntry *File);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
