[clang] de85739 - [clang] NFCI: Use `FileEntryRef` in additional module maps
Jan Svoboda via cfe-commits
cfe-commits at lists.llvm.org
Thu Sep 28 14:49:50 PDT 2023
Author: Jan Svoboda
Date: 2023-09-28T14:49:45-07:00
New Revision: de85739ded2edddc568f287d4f94c2dc1ab97dd7
URL: https://github.com/llvm/llvm-project/commit/de85739ded2edddc568f287d4f94c2dc1ab97dd7
DIFF: https://github.com/llvm/llvm-project/commit/de85739ded2edddc568f287d4f94c2dc1ab97dd7.diff
LOG: [clang] NFCI: Use `FileEntryRef` in additional module maps
Added:
Modified:
clang/lib/Serialization/ASTReader.cpp
clang/lib/Serialization/ASTWriter.cpp
Removed:
################################################################################
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 9cb0d06b7542187..4ff145bb1e252c1 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -4096,11 +4096,11 @@ ASTReader::ReadModuleMapFileBlock(RecordData &Record, ModuleFile &F,
return OutOfDate;
}
- llvm::SmallPtrSet<const FileEntry *, 1> AdditionalStoredMaps;
+ llvm::SmallPtrSet<FileEntryRef, 1> AdditionalStoredMaps;
for (unsigned I = 0, N = Record[Idx++]; I < N; ++I) {
// FIXME: we should use input files rather than storing names.
std::string Filename = ReadPath(F, Record, Idx);
- auto SF = FileMgr.getFile(Filename, false, false);
+ auto SF = FileMgr.getOptionalFileRef(Filename, false, false);
if (!SF) {
if (!canRecoverFromOutOfDate(F.FileName, ClientLoadCapabilities))
Error("could not find file '" + Filename +"' referenced by AST file");
@@ -4126,10 +4126,10 @@ ASTReader::ReadModuleMapFileBlock(RecordData &Record, ModuleFile &F,
// Check any additional module map files that are in the pcm, but not
// found in header search. Cases that match are already removed.
- for (const FileEntry *ModMap : AdditionalStoredMaps) {
+ for (FileEntryRef ModMap : AdditionalStoredMaps) {
if (!canRecoverFromOutOfDate(F.FileName, ClientLoadCapabilities))
Diag(diag::err_module_
diff erent_modmap)
- << F.ModuleName << /*not new*/1 << ModMap->getName();
+ << F.ModuleName << /*not new*/1 << ModMap.getName();
return OutOfDate;
}
}
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index b94acccb93e2f08..e6f6bb921f16a9e 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -1383,13 +1383,13 @@ void ASTWriter::WriteControlBlock(Preprocessor &PP, ASTContext &Context,
if (auto *AdditionalModMaps =
Map.getAdditionalModuleMapFiles(WritingModule)) {
Record.push_back(AdditionalModMaps->size());
- SmallVector<const FileEntry *, 1> ModMaps(AdditionalModMaps->begin(),
- AdditionalModMaps->end());
- llvm::sort(ModMaps, [](const FileEntry *A, const FileEntry *B) {
- return A->getName() < B->getName();
+ SmallVector<FileEntryRef, 1> ModMaps(AdditionalModMaps->begin(),
+ AdditionalModMaps->end());
+ llvm::sort(ModMaps, [](FileEntryRef A, FileEntryRef B) {
+ return A.getName() < B.getName();
});
- for (const FileEntry *F : ModMaps)
- AddPath(F->getName(), Record);
+ for (FileEntryRef F : ModMaps)
+ AddPath(F.getName(), Record);
} else {
Record.push_back(0);
}
More information about the cfe-commits
mailing list