[clang] NFCI: Use FileEntryRef in ModuleMap

This commit is contained in:
Jan Svoboda
2023-09-09 08:43:50 -07:00
parent c23d65b90f
commit 37b08892fc
3 changed files with 5 additions and 5 deletions

View File

@@ -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.
///

View File

@@ -1339,7 +1339,7 @@ ModuleMap::canonicalizeModuleMapPath(SmallVectorImpl<char> &Path) {
}
void ModuleMap::addAdditionalModuleMapFile(const Module *M,
const FileEntry *ModuleMap) {
FileEntryRef ModuleMap) {
AdditionalModMaps[M].insert(ModuleMap);
}

View File

@@ -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;
}
}