averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +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-ci
2018-11-26 11:32:00 -08:00
parent fe7f00e7bd 6afe77ae98
commit 5ffb33378a
13 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Frontend/ParseableInterfaceSupport.cpp
View File

@@ -629,6 +629,9 @@ public:
return;
}
if (!isPublicOrUsableFromInline(nominal))
return;
map[nominal].recordProtocols(directlyInherited);
// Recurse to find any nested types.
@@ -647,6 +650,9 @@ public:
return;
const NominalTypeDecl *nominal = extension->getExtendedNominal();
if (!isPublicOrUsableFromInline(nominal))
return;
map[nominal].recordConditionalConformances(extension->getInherited());
// No recursion here because extensions are never nested.
}