Skip to content

Commit 8c9435e

Browse files
committed
Revert "[Dependency Scanning] Update Uses of ModuleDeps::ClangModuleDeps
This reverts commit 024dbd0, reversing changes made to a08b1cb.
1 parent 98c3993 commit 8c9435e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

lib/ClangImporter/ClangModuleDependencyScanner.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,13 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
242242
clangModuleDep.IsSystem);
243243

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

0 commit comments

Comments
 (0)