@@ -391,8 +391,8 @@ ModuleDepCollector::getInvocationAdjustedForModuleBuildWithoutOutputs(
391391llvm::DenseSet<const FileEntry *> ModuleDepCollector::collectModuleMapFiles (
392392 ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const {
393393 llvm::DenseSet<const FileEntry *> ModuleMapFiles;
394- for (const auto &MID : ClangModuleDeps) {
395- ModuleDeps *MD = ModuleDepsByID.lookup (MID .ID );
394+ for (const auto &Info : ClangModuleDeps) {
395+ ModuleDeps *MD = ModuleDepsByID.lookup (Info .ID );
396396 assert (MD && " Inconsistent dependency info" );
397397 // TODO: Track ClangModuleMapFile as `FileEntryRef`.
398398 auto FE = ScanInstance.getFileManager ().getOptionalFileRef (
@@ -409,8 +409,8 @@ void ModuleDepCollector::addModuleMapFiles(
409409 if (Service.shouldEagerLoadModules ())
410410 return ; // Only pcm is needed for eager load.
411411
412- for (const auto &MID : ClangModuleDeps) {
413- ModuleDeps *MD = ModuleDepsByID.lookup (MID .ID );
412+ for (const auto &Info : ClangModuleDeps) {
413+ ModuleDeps *MD = ModuleDepsByID.lookup (Info .ID );
414414 assert (MD && " Inconsistent dependency info" );
415415 CI.getFrontendOpts ().ModuleMapFiles .push_back (MD->ClangModuleMapFile );
416416 }
@@ -419,32 +419,32 @@ void ModuleDepCollector::addModuleMapFiles(
419419void ModuleDepCollector::addModuleFiles (
420420 CompilerInvocation &CI,
421421 ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const {
422- for (const auto &MID : ClangModuleDeps) {
423- ModuleDeps *MD = ModuleDepsByID.lookup (MID .ID );
422+ for (const auto &Info : ClangModuleDeps) {
423+ ModuleDeps *MD = ModuleDepsByID.lookup (Info .ID );
424424 std::string PCMPath =
425425 Controller.lookupModuleOutput (*MD, ModuleOutputKind::ModuleFile);
426426
427427 if (Service.shouldEagerLoadModules ())
428428 CI.getFrontendOpts ().ModuleFiles .push_back (std::move (PCMPath));
429429 else
430430 CI.getHeaderSearchOpts ().PrebuiltModuleFiles .insert (
431- {MID .ID .ModuleName , std::move (PCMPath)});
431+ {Info .ID .ModuleName , std::move (PCMPath)});
432432 }
433433}
434434
435435void ModuleDepCollector::addModuleFiles (
436436 CowCompilerInvocation &CI,
437437 ArrayRef<ModuleDeps::DepInfo> ClangModuleDeps) const {
438- for (const auto &MID : ClangModuleDeps) {
439- ModuleDeps *MD = ModuleDepsByID.lookup (MID .ID );
438+ for (const auto &Info : ClangModuleDeps) {
439+ ModuleDeps *MD = ModuleDepsByID.lookup (Info .ID );
440440 std::string PCMPath =
441441 Controller.lookupModuleOutput (*MD, ModuleOutputKind::ModuleFile);
442442
443443 if (Service.shouldEagerLoadModules ())
444444 CI.getMutFrontendOpts ().ModuleFiles .push_back (std::move (PCMPath));
445445 else
446446 CI.getMutHeaderSearchOpts ().PrebuiltModuleFiles .insert (
447- {MID .ID .ModuleName , std::move (PCMPath)});
447+ {Info .ID .ModuleName , std::move (PCMPath)});
448448 }
449449}
450450
0 commit comments