Skip to content

[5.0 12-12] [Substitution map] When the superclass conforms to a protocol directly, use it #21511

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
AnnaZaks merged 1 commit into from
Dec 22, 2018
Merged

[5.0 12-12] [Substitution map] When the superclass conforms to a protocol directly, use it #21511

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
18 changes: 8 additions & 10 deletions lib/AST/SubstitutionMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,19 +353,17 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {
return None;
};

// Check whether the superclass conforms.
if (auto superclass = genericSig->getSuperclassBound(type)) {
LookUpConformanceInSignature lookup(*getGenericSignature());
if (auto conformance = lookup(type->getCanonicalType(), superclass, proto))
return conformance;
}

// If the type doesn't conform to this protocol, the result isn't formed
// from these requirements.
if (!genericSig->conformsToProtocol(type, proto)) {
// Check whether the superclass conforms.
if (auto superclass = genericSig->getSuperclassBound(type)) {
return LookUpConformanceInSignature(*getGenericSignature())(
type->getCanonicalType(),
superclass,
proto);
}

if (!genericSig->conformsToProtocol(type, proto))
return None;
}

auto accessPath =
genericSig->getConformanceAccessPath(type, proto);
Expand Down