Skip to content

Commit f8798ce

Browse files
authored
[DependencyScanner] Update ModuleID to ModuleDeps in lookupModule calls (#80073)
This allows to read more attributes like isInSysroot.
1 parent f457d9c commit f8798ce

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

lib/ClangImporter/ClangModuleDependencyScanner.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ ClangImporter::getModuleDependencies(Identifier moduleName,
421421
std::string workingDir = *optionalWorkingDir;
422422

423423
auto lookupModuleOutput =
424-
[moduleOutputPath](const ModuleID &MID,
425-
ModuleOutputKind MOK) -> std::string {
426-
return moduleCacheRelativeLookupModuleOutput(MID, MOK, moduleOutputPath);
424+
[moduleOutputPath](const ModuleDeps &MD,
425+
ModuleOutputKind MOK) -> std::string {
426+
return moduleCacheRelativeLookupModuleOutput(MD.ID, MOK, moduleOutputPath);
427427
};
428428

429429
auto clangModuleDependencies =
@@ -476,9 +476,10 @@ bool ClangImporter::getHeaderDependencies(
476476
std::string workingDir = *optionalWorkingDir;
477477
auto moduleOutputPath = cache.getModuleOutputPath();
478478
auto lookupModuleOutput =
479-
[moduleOutputPath](const ModuleID &MID,
479+
[moduleOutputPath](const ModuleDeps &MD,
480480
ModuleOutputKind MOK) -> std::string {
481-
return moduleCacheRelativeLookupModuleOutput(MID, MOK, moduleOutputPath);
481+
return moduleCacheRelativeLookupModuleOutput(MD.ID, MOK,
482+
moduleOutputPath);
482483
};
483484
auto dependencies = clangScanningTool.getTranslationUnitDependencies(
484485
commandLineArgs, workingDir, cache.getAlreadySeenClangModules(),

0 commit comments

Comments
 (0)