averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sema: Remove ConformanceCheckOptions::SkipConditionalRequirements

Browse Source 
All callers can trivially be refactored to use ModuleDecl::lookupConformance()
instead. Since this was the last flag in ConformanceCheckOptions, we can remove
that, too.
This commit is contained in:
Slava Pestov
2020-04-22 22:25:25 -04:00
parent 86d557f871
commit 742bd98402
28 changed files with 119 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Sema/CSSimplify.cpp
View File

@@ -5179,8 +5179,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
switch (kind) {
case ConstraintKind::SelfObjectOfProtocol: {
auto conformance = TypeChecker::containsProtocol(
type, protocol, DC,
ConformanceCheckFlags::SkipConditionalRequirements);
type, protocol, DC, /*skipConditionalRequirements=*/true);
if (conformance) {
return recordConformance(conformance);
}
@@ -5188,9 +5187,8 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
case ConstraintKind::ConformsTo:
case ConstraintKind::LiteralConformsTo: {
// Check whether this type conforms to the protocol.
auto conformance = TypeChecker::conformsToProtocol(
type, protocol, DC,
ConformanceCheckFlags::SkipConditionalRequirements);
auto conformance = DC->getParentModule()->lookupConformance(
type, protocol);
if (conformance) {
return recordConformance(conformance);
}
@@ -6869,9 +6867,8 @@ ConstraintSystem::simplifyValueWitnessConstraint(
// conformance already?
auto proto = requirement->getDeclContext()->getSelfProtocolDecl();
assert(proto && "Value witness constraint for a non-requirement");
auto conformance = TypeChecker::conformsToProtocol(
baseObjectType, proto, useDC,
ConformanceCheckFlags::SkipConditionalRequirements);
auto conformance = useDC->getParentModule()->lookupConformance(
baseObjectType, proto);
if (!conformance) {
// The conformance failed, so mark the member type as a "hole". We cannot
// do anything further here.