Change ModuleDecl::getImportedModules to take an option set

...in preparation for me adding a third kind of import, making the
existing "All" kind a problem. NFC, except that I did rewrite the
ClangModuleUnit implementation of getImportedModules to be simpler!
This commit is contained in:
Jordan Rose
2018-12-13 17:45:06 -08:00
parent a62c87f6cd
commit 9ed3fe061d
18 changed files with 97 additions and 102 deletions

View File

@@ -788,8 +788,12 @@ static void collectModuleDependencies(ModuleDecl *TopMod,
return;
auto ClangModuleLoader = TopMod->getASTContext().getClangModuleLoader();
ModuleDecl::ImportFilter ImportFilter;
ImportFilter |= ModuleDecl::ImportFilterKind::Public;
ImportFilter |= ModuleDecl::ImportFilterKind::Private;
SmallVector<ModuleDecl::ImportedModule, 8> Imports;
TopMod->getImportedModules(Imports, ModuleDecl::ImportFilter::All);
TopMod->getImportedModules(Imports, ImportFilter);
for (auto Import : Imports) {
ModuleDecl *Mod = Import.second;