averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-06-23 10:39:14 -07:00
parent bbf76203eb 0da060e95e
commit 75bea14185
12 changed files with 65 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -1088,12 +1088,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);