Skip to content

Commit 96587bc

Browse files
authored
Refactor construction of ModuleDecl::ImportFilters to use new initializer list constructor (swiftlang#33250)
This commit makes code cleaner by using newly introduced initializer list construction
1 parent 84f44bf commit 96587bc

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

lib/AST/Module.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,9 +1459,10 @@ SourceFile::collectLinkLibraries(ModuleDecl::LinkLibraryCallback callback) const
14591459
llvm::SmallDenseSet<ModuleDecl *, 32> visited;
14601460
SmallVector<ModuleDecl::ImportedModule, 32> stack;
14611461

1462-
ModuleDecl::ImportFilter filter = ModuleDecl::ImportFilterKind::Public;
1463-
filter |= ModuleDecl::ImportFilterKind::Private;
1464-
filter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
1462+
ModuleDecl::ImportFilter filter = {
1463+
ModuleDecl::ImportFilterKind::Public,
1464+
ModuleDecl::ImportFilterKind::Private,
1465+
ModuleDecl::ImportFilterKind::SPIAccessControl};
14651466

14661467
auto *topLevel = getParentModule();
14671468

lib/Frontend/ModuleInterfaceSupport.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ static void printImports(raw_ostream &out,
100100
ModuleDecl *M) {
101101
// FIXME: This is very similar to what's in Serializer::writeInputBlock, but
102102
// it's not obvious what higher-level optimization would be factored out here.
103-
ModuleDecl::ImportFilter allImportFilter;
104-
allImportFilter |= ModuleDecl::ImportFilterKind::Public;
105-
allImportFilter |= ModuleDecl::ImportFilterKind::Private;
106-
allImportFilter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
103+
ModuleDecl::ImportFilter allImportFilter = {
104+
ModuleDecl::ImportFilterKind::Public,
105+
ModuleDecl::ImportFilterKind::Private,
106+
ModuleDecl::ImportFilterKind::SPIAccessControl};
107107

108108
// With -experimental-spi-imports:
109109
// When printing the private swiftinterface file, print implementation-only

0 commit comments

Comments
 (0)