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/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-08-19 16:13:41 -07:00
parent 0a45079156 05645a1887
commit 33d94e0805
11 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/Serialization.cpp
View File

@@ -3521,7 +3521,9 @@ public:
for (auto element : proto->getInherited()) {
auto elementType = element.getType();
assert(!elementType || !elementType->hasArchetype());
if (elementType && elementType->is<ProtocolType>())
if (elementType &&
(elementType->is<ProtocolType>() ||
elementType->is<ProtocolCompositionType>()))
dependencyTypes.insert(elementType);
}