aboutsummaryrefslogtreecommitdiff
path: root/clang
diff options
context:
space:
mode:
authorJan Svoboda <jan_svoboda@apple.com>2023-09-09 08:43:50 -0700
committerJan Svoboda <jan_svoboda@apple.com>2023-09-09 09:12:35 -0700
commit37b08892fc1ada83f09b4630190f8fb7346923cd (patch)
tree389dbba5831910e57016e92c1da4e28589400dad /clang
parentc23d65b90fb7fb07cb12e2d70d0c34376b8fcdad (diff)
downloadllvm-37b08892fc1ada83f09b4630190f8fb7346923cd.zip
llvm-37b08892fc1ada83f09b4630190f8fb7346923cd.tar.gz
llvm-37b08892fc1ada83f09b4630190f8fb7346923cd.tar.bz2
[clang] NFCI: Use `FileEntryRef` in `ModuleMap`
Diffstat (limited to 'clang')
-rw-r--r--clang/include/clang/Lex/ModuleMap.h4
-rw-r--r--clang/lib/Lex/ModuleMap.cpp2
-rw-r--r--clang/lib/Serialization/ASTReader.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/clang/include/clang/Lex/ModuleMap.h b/clang/include/clang/Lex/ModuleMap.h
index 05f30dd..a25a790e 100644
--- a/clang/include/clang/Lex/ModuleMap.h
+++ b/clang/include/clang/Lex/ModuleMap.h
@@ -194,7 +194,7 @@ public:
}
};
- using AdditionalModMapsSet = llvm::SmallPtrSet<const FileEntry *, 1>;
+ using AdditionalModMapsSet = llvm::SmallPtrSet<FileEntryRef, 1>;
private:
friend class ModuleMapParser;
@@ -653,7 +653,7 @@ public:
return &I->second;
}
- void addAdditionalModuleMapFile(const Module *M, const FileEntry *ModuleMap);
+ void addAdditionalModuleMapFile(const Module *M, FileEntryRef ModuleMap);
/// Resolve all of the unresolved exports in the given module.
///
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index 7a759a2..39af2e8 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -1339,7 +1339,7 @@ ModuleMap::canonicalizeModuleMapPath(SmallVectorImpl<char> &Path) {
}
void ModuleMap::addAdditionalModuleMapFile(const Module *M,
- const FileEntry *ModuleMap) {
+ FileEntryRef ModuleMap) {
AdditionalModMaps[M].insert(ModuleMap);
}
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 576da09..0cfecdd 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -4096,13 +4096,13 @@ ASTReader::ReadModuleMapFileBlock(RecordData &Record, ModuleFile &F,
// Check any additional module map files (e.g. module.private.modulemap)
// that are not in the pcm.
if (auto *AdditionalModuleMaps = Map.getAdditionalModuleMapFiles(M)) {
- for (const FileEntry *ModMap : *AdditionalModuleMaps) {
+ for (FileEntryRef ModMap : *AdditionalModuleMaps) {
// Remove files that match
// Note: SmallPtrSet::erase is really remove
if (!AdditionalStoredMaps.erase(ModMap)) {
if (!canRecoverFromOutOfDate(F.FileName, ClientLoadCapabilities))
Diag(diag::err_module_different_modmap)
- << F.ModuleName << /*new*/0 << ModMap->getName();
+ << F.ModuleName << /*new*/0 << ModMap.getName();
return OutOfDate;
}
}