Give OptionSet an initializer_list constructor.

This makes it easier to specify OptionSet arguments.

Also modify appropriate uses of ModuleDecl::ImportFilter to take
advantage of the new constructor.
This commit is contained in:
Martin Boehme
2020-06-18 15:45:43 +02:00
parent d45047dfb3
commit d806ba53f6
12 changed files with 65 additions and 72 deletions

View File

@@ -907,9 +907,9 @@ static void collectModuleDependencies(ModuleDecl *TopMod,
auto ClangModuleLoader = TopMod->getASTContext().getClangModuleLoader();
ModuleDecl::ImportFilter ImportFilter;
ImportFilter |= ModuleDecl::ImportFilterKind::Public;
ImportFilter |= ModuleDecl::ImportFilterKind::Private;
ModuleDecl::ImportFilter ImportFilter = {
ModuleDecl::ImportFilterKind::Public,
ModuleDecl::ImportFilterKind::Private};
if (Visited.empty()) {
// Only collect implementation-only dependencies from the main module.
ImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;