Skip to content

[Serialization] Write protocol compositions as dependencies of protocols #38958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2021
Merged

[Serialization] Write protocol compositions as dependencies of protocols #38958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/Serialization/Serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3511,7 +3511,9 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
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);
}

Expand Down
11 changes: 11 additions & 0 deletions test/Serialization/Recovery/implementation-only-missing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public protocol HiddenProtocol {
associatedtype Value
}

public protocol HiddenProtocol2 {}

public protocol HiddenProtocolWithOverride {
func hiddenOverride()
}
Expand Down Expand Up @@ -98,6 +100,15 @@ public class SomeClass {
func funcUsingIoiType(_ a: HiddenClass) {}
}

// Check that we recover from a reference to an implementation-only
// imported type in a protocol composition. rdar://78631465
protocol CompositionMemberInheriting : HiddenProtocol2 {}
protocol CompositionMemberSimple {}
protocol InheritingFromComposition : CompositionMemberInheriting & CompositionMemberSimple {}
struct StructInheritingFromComposition : CompositionMemberInheriting & CompositionMemberSimple {}
class ClassInheritingFromComposition : CompositionMemberInheriting & CompositionMemberSimple {}
protocol InheritingFromCompositionDirect : CompositionMemberSimple & HiddenProtocol2 {}

#elseif CLIENT_APP

import public_lib
Expand Down