Skip to content

[DependencyScanner] Update ModuleID to ModuleDeps in lookupModule calls, NFCI #80073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
Merged

[DependencyScanner] Update ModuleID to ModuleDeps in lookupModule calls, NFCI #80073

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/ClangImporter/ClangModuleDependencyScanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,9 @@ ClangImporter::getModuleDependencies(Identifier moduleName,
std::string workingDir = *optionalWorkingDir;

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

auto clangModuleDependencies =
Expand Down Expand Up @@ -476,9 +476,10 @@ bool ClangImporter::getHeaderDependencies(
std::string workingDir = *optionalWorkingDir;
auto moduleOutputPath = cache.getModuleOutputPath();
auto lookupModuleOutput =
[moduleOutputPath](const ModuleID &MID,
[moduleOutputPath](const ModuleDeps &MD,
ModuleOutputKind MOK) -> std::string {
return moduleCacheRelativeLookupModuleOutput(MID, MOK, moduleOutputPath);
return moduleCacheRelativeLookupModuleOutput(MD.ID, MOK,
moduleOutputPath);
};
auto dependencies = clangScanningTool.getTranslationUnitDependencies(
commandLineArgs, workingDir, cache.getAlreadySeenClangModules(),
Expand Down