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-09-21 13:26:46 -07:00
parent fc8fd5fbb9 4d875ee337
commit 7220ae3d2e
431 changed files with 445 additions and 10050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/ModuleFile.cpp
View File

@@ -486,7 +486,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
SmallVector<ValueDecl *, 8> Decls;
TopLevelModule->lookupQualified(
TopLevelModule, DeclNameRef(ScopeID),
NL_QualifiedDefault | NL_KnownNoDependency, Decls);
NL_QualifiedDefault, Decls);
Optional<ImportKind> FoundKind = ImportDecl::findBestImportKind(Decls);
assert(FoundKind.hasValue() &&
"deserialized imports should not be ambiguous");