Merge pull request #15415 from huonw/conditional-conformance-as

[CS] Handle conditional requirements in existential conversions of literals
This commit is contained in:
Huon Wilson
2018-03-22 12:30:14 +11:00
committed by GitHub
2 changed files with 132 additions and 1 deletions

View File

@@ -2628,7 +2628,8 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
case ConstraintKind::SelfObjectOfProtocol:
if (auto conformance =
TC.containsProtocol(type, protocol, DC,
ConformanceCheckFlags::InExpression)) {
(ConformanceCheckFlags::InExpression|
ConformanceCheckFlags::SkipConditionalRequirements))) {
return recordConformance(*conformance);
}
break;