================
@@ -2136,20 +2136,20 @@ bool ModuleMap::parseModuleMapFile(FileEntryRef File,
bool IsSystem,
assert(Target && "Missing target information");
std::optional<llvm::MemoryBufferRef> Buffer = SourceMgr.getBufferOrNone(ID);
if (!Buffer)
- return ParsedModuleMap[File] = true;
+ return LoadedModuleMap[File] = true;
assert((!Offset || *Offset <= Buffer->getBufferSize()) &&
"invalid buffer offset");
std::optional<modulemap::ModuleMapFile> MMF =
modulemap::parseModuleMap(ID, Dir, SourceMgr, Diags, IsSystem, Offset);
bool Result = false;
if (MMF) {
- ModuleMapParser Parser(*MMF, SourceMgr, Diags, *this, ID, Dir, IsSystem);
- Result = Parser.parseModuleMapFile();
+ ModuleMapLoader Loader(*MMF, SourceMgr, Diags, *this, ID, Dir, IsSystem);
+ Result = Loader.loadModuleMapFile();
}
- ParsedModuleMap[File] = Result;
+ LoadedModuleMap[File] = Result;
- // Notify callbacks that we parsed it.
+ // Notify callbacks that we loaded it.
for (const auto &Cb : Callbacks)
Cb->moduleMapFileRead(MMF ? MMF->Start : SourceLocation(), File, IsSystem);
----------------
jansvoboda11 wrote:
Although... Maybe the comment just above the loop is now not 100% accurate 😅
https://github.com/llvm/llvm-project/pull/132970
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
