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

Merge pull request #61944 from angela-laar/refactor-generate-constraints-for-closures

Browse Source 
[CSClosure] Refactor generateConstraints
This commit is contained in:
Angela Laar
2022-11-17 07:44:05 -08:00
committed by GitHub
parent b89ab8437d b6637e4586
commit dcfeff715b
3 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/CSSimplify.cpp
View File

@@ -10798,7 +10798,7 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
setSolutionApplicationTarget(closure, target);
// Generate constraints from the body of this closure.
return !generateConstraints(closure);
return !generateConstraints(AnyFunctionRef{closure}, closure->getBody());
}
ConstraintSystem::SolutionKind
@@ -14545,7 +14545,7 @@ ConstraintSystem::simplifyConstraint(const Constraint &constraint) {
case ConstraintKind::Disjunction:
case ConstraintKind::Conjunction:
// {Dis, Con}junction constraints are never solved here.
// See {Dis, Con}junctionStep class in CSStep.cpp for solving
return SolutionKind::Unsolved;
case ConstraintKind::OneWayEqual: