Merge pull request #32447 from martinboehme/option-set-initializer-list

Give OptionSet an initializer_list constructor
This commit is contained in:
Robert Widmann
2020-06-23 10:36:57 -07:00
committed by GitHub
12 changed files with 65 additions and 72 deletions

View File

@@ -1087,12 +1087,9 @@ void SerializedASTFile::getImportedModules(
void SerializedASTFile::collectLinkLibrariesFromImports(
ModuleDecl::LinkLibraryCallback callback) const {
ModuleDecl::ImportFilter ImportFilter;
ImportFilter |= ModuleDecl::ImportFilterKind::Public;
ImportFilter |= ModuleDecl::ImportFilterKind::Private;
llvm::SmallVector<ModuleDecl::ImportedModule, 8> Imports;
File.getImportedModules(Imports, ImportFilter);
File.getImportedModules(Imports, {ModuleDecl::ImportFilterKind::Public,
ModuleDecl::ImportFilterKind::Private});
for (auto Import : Imports)
Import.importedModule->collectLinkLibraries(callback);