Author: Jan Svoboda Date: 2023-09-09T09:12:35-07:00 New Revision: 37b08892fc1ada83f09b4630190f8fb7346923cd
URL: https://github.com/llvm/llvm-project/commit/37b08892fc1ada83f09b4630190f8fb7346923cd DIFF: https://github.com/llvm/llvm-project/commit/37b08892fc1ada83f09b4630190f8fb7346923cd.diff LOG: [clang] NFCI: Use `FileEntryRef` in `ModuleMap` Added: Modified: clang/include/clang/Lex/ModuleMap.h clang/lib/Lex/ModuleMap.cpp clang/lib/Serialization/ASTReader.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Lex/ModuleMap.h b/clang/include/clang/Lex/ModuleMap.h index 05f30dd2eaa373f..a25a790e544e238 100644 --- a/clang/include/clang/Lex/ModuleMap.h +++ b/clang/include/clang/Lex/ModuleMap.h @@ -194,7 +194,7 @@ class ModuleMap { } }; - using AdditionalModMapsSet = llvm::SmallPtrSet<const FileEntry *, 1>; + using AdditionalModMapsSet = llvm::SmallPtrSet<FileEntryRef, 1>; private: friend class ModuleMapParser; @@ -653,7 +653,7 @@ class ModuleMap { 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 7a759a2039d158c..39af2e8df106a66 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 576da09095002b0..0cfecddc198db5a 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_ diff erent_modmap) - << F.ModuleName << /*new*/0 << ModMap->getName(); + << F.ModuleName << /*new*/0 << ModMap.getName(); return OutOfDate; } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
