File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -3618,7 +3618,8 @@ Type ConstraintSystem::simplifyTypeImpl(Type type,
3618
3618
if (auto selfType = lookupBaseType->getAs <DynamicSelfType>())
3619
3619
lookupBaseType = selfType->getSelfType ();
3620
3620
3621
- if (lookupBaseType->mayHaveMembers ()) {
3621
+ if (lookupBaseType->mayHaveMembers () ||
3622
+ lookupBaseType->is <PackType>()) {
3622
3623
auto *proto = assocType->getProtocol ();
3623
3624
auto conformance = DC->getParentModule ()->lookupConformance (
3624
3625
lookupBaseType, proto);
@@ -3642,9 +3643,8 @@ Type ConstraintSystem::simplifyTypeImpl(Type type,
3642
3643
return memberTy;
3643
3644
}
3644
3645
3645
- auto subs = SubstitutionMap::getProtocolSubstitutions (
3646
- proto, lookupBaseType, conformance);
3647
- auto result = assocType->getDeclaredInterfaceType ().subst (subs);
3646
+ auto result = conformance.getAssociatedType (
3647
+ lookupBaseType, assocType->getDeclaredInterfaceType ());
3648
3648
if (!result->hasError ())
3649
3649
return result;
3650
3650
}
You can’t perform that action at this time.
0 commit comments