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

[Constraint solver] Lazily handle conformance-related constraints.

Browse Source 
The code was already there for them; make sure we use it
consistently.
This commit is contained in:
Doug Gregor
2016-10-21 16:12:11 -07:00
parent 8451536e89
commit af4d44e013
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/CSSimplify.cpp
View File

@@ -4138,6 +4138,12 @@ ConstraintSystem::addConstraintImpl(ConstraintKind kind, Type first,
case ConstraintKind::DynamicTypeOf: case ConstraintKind::DynamicTypeOf:
return simplifyDynamicTypeOfConstraint(first, second, subflags, locator); return simplifyDynamicTypeOfConstraint(first, second, subflags, locator);
case ConstraintKind::ConformsTo:
case ConstraintKind::LiteralConformsTo:
case ConstraintKind::SelfObjectOfProtocol:
return simplifyConformsToConstraint(first, second, kind, locator,
subflags);
case ConstraintKind::Bind: // FIXME: This should go through matchTypes() above case ConstraintKind::Bind: // FIXME: This should go through matchTypes() above
default: { default: {
@@ -4149,6 +4155,12 @@ ConstraintSystem::addConstraintImpl(ConstraintKind kind, Type first,
addConstraint(c); addConstraint(c);
return SolutionKind::Solved; return SolutionKind::Solved;
} }
case ConstraintKind::ValueMember:
case ConstraintKind::UnresolvedValueMember:
case ConstraintKind::TypeMember:
case ConstraintKind::BindOverload:
llvm_unreachable("Use the correct addConstraint()");
} }
} }