Skip to content

Revert "[Dependency Scanning] Update Uses of ModuleDeps::ClangModuleDeps #81243" #81658

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
Jun 9, 2025
+6 −4
Merged

Revert "[Dependency Scanning] Update Uses of ModuleDeps::ClangModuleDeps #81243" #81658

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
10 changes: 6 additions & 4 deletions lib/ClangImporter/ClangModuleDependencyScanner.cpp
View file
Original file line number Diff line number Diff line change
@@ -242,11 +242,13 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
clangModuleDep.IsSystem);

std::vector<ModuleDependencyID> directDependencyIDs;
for (const auto &DepInfo : clangModuleDep.ClangModuleDeps) {
auto moduleName = DepInfo.ID.ModuleName;
dependencies.addModuleImport(moduleName, DepInfo.Exported, &alreadyAddedModules);
for (const auto &moduleName : clangModuleDep.ClangModuleDeps) {
// FIXME: This assumes, conservatively, that all Clang module imports
// are exported. We need to fix this once the clang scanner gains the appropriate
// API to query this.
dependencies.addModuleImport(moduleName.ModuleName, /* isExported */ true, &alreadyAddedModules);
// It is safe to assume that all dependencies of a Clang module are Clang modules.
directDependencyIDs.push_back({moduleName, ModuleDependencyKind::Clang});
directDependencyIDs.push_back({moduleName.ModuleName, ModuleDependencyKind::Clang});
}
dependencies.setImportedClangDependencies(directDependencyIDs);
result.push_back(std::make_pair(ModuleDependencyID{clangModuleDep.ID.ModuleName,