Skip to content

Commit eac3fb4

Browse files
committed
[CS] NFC: Default the allowFreeTypeVariables parameter
All but one client wants to set this to anything other than `FreeTypeVariableBinding::Disallow`.
1 parent b885da4 commit eac3fb4

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

include/swift/Sema/ConstraintSystem.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5110,7 +5110,8 @@ class ConstraintSystem {
51105110
/// \returns true if an error occurred, false otherwise.
51115111
LLVM_NODISCARD
51125112
bool generateConstraints(SolutionApplicationTarget &target,
5113-
FreeTypeVariableBinding allowFreeTypeVariables);
5113+
FreeTypeVariableBinding allowFreeTypeVariables =
5114+
FreeTypeVariableBinding::Disallow);
51145115

51155116
/// Generate constraints for the body of the given function or closure.
51165117
///

lib/Sema/BuilderTransform.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class BuilderClosureVisitor
359359
// binding.
360360
if (cs) {
361361
SolutionApplicationTarget target(patternBinding);
362-
if (cs->generateConstraints(target, FreeTypeVariableBinding::Disallow))
362+
if (cs->generateConstraints(target))
363363
hadError = true;
364364
}
365365
}
@@ -661,7 +661,7 @@ class BuilderClosureVisitor
661661
// FIXME: Add contextual type purpose for switch subjects?
662662
SolutionApplicationTarget target(subjectExpr, dc, CTP_Unused, Type(),
663663
/*isDiscarded=*/false);
664-
if (cs->generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
664+
if (cs->generateConstraints(target)) {
665665
hadError = true;
666666
return nullptr;
667667
}
@@ -789,7 +789,7 @@ class BuilderClosureVisitor
789789
auto target = SolutionApplicationTarget::forForEachStmt(
790790
forEachStmt, dc, /*bindPatternVarsOneWay=*/true);
791791
if (cs) {
792-
if (cs->generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
792+
if (cs->generateConstraints(target)) {
793793
hadError = true;
794794
return nullptr;
795795
}
@@ -890,7 +890,7 @@ class BuilderClosureVisitor
890890
CTP_ThrowStmt,
891891
ctx.getErrorExistentialType(),
892892
/*isDiscarded=*/false);
893-
if (cs->generateConstraints(target, FreeTypeVariableBinding::Disallow))
893+
if (cs->generateConstraints(target))
894894
hadError = true;
895895

896896
cs->setSolutionApplicationTarget(throwStmt, target);

lib/Sema/CSGen.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4074,7 +4074,7 @@ namespace {
40744074
auto &CS = CG.getConstraintSystem();
40754075
for (const auto &capture : captureList->getCaptureList()) {
40764076
SolutionApplicationTarget target(capture.PBD);
4077-
if (CS.generateConstraints(target, FreeTypeVariableBinding::Disallow))
4077+
if (CS.generateConstraints(target))
40784078
return Action::Stop();
40794079
}
40804080
}
@@ -4327,8 +4327,7 @@ generateForEachStmtConstraints(
43274327
TypeLoc::withoutLoc(sequenceProto->getDeclaredInterfaceType()),
43284328
CTP_ForEachSequence);
43294329

4330-
if (cs.generateConstraints(makeIteratorTarget,
4331-
FreeTypeVariableBinding::Disallow))
4330+
if (cs.generateConstraints(makeIteratorTarget))
43324331
return None;
43334332

43344333
forEachStmtInfo.makeIteratorVar = PB;
@@ -4613,7 +4612,7 @@ bool ConstraintSystem::generateConstraints(
46134612
: SolutionApplicationTarget::forUninitializedVar(
46144613
patternBinding, index, patternType);
46154614

4616-
if (generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
4615+
if (generateConstraints(target)) {
46174616
hadError = true;
46184617
continue;
46194618
}
@@ -4698,7 +4697,7 @@ bool ConstraintSystem::generateConstraints(StmtCondition condition,
46984697
auto target = SolutionApplicationTarget(symbolExpr, dc, CTP_Unused,
46994698
Type(), /*isDiscarded=*/false);
47004699

4701-
if (generateConstraints(target, FreeTypeVariableBinding::Disallow))
4700+
if (generateConstraints(target))
47024701
return true;
47034702

47044703
setSolutionApplicationTarget(&condElement, target);

lib/Sema/CSSimplify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9869,7 +9869,7 @@ static bool inferEnumMemberThroughTildeEqualsOperator(
98699869
}
98709870
}
98719871

9872-
if (cs.generateConstraints(target, FreeTypeVariableBinding::Disallow))
9872+
if (cs.generateConstraints(target))
98739873
return true;
98749874

98759875
// Sub-expression associated with expression pattern is the enum element

lib/Sema/CSSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,7 @@ bool ConstraintSystem::solveForCodeCompletion(
16841684
<< "--- Code Completion ---\n";
16851685
}
16861686

1687-
if (generateConstraints(target, FreeTypeVariableBinding::Disallow))
1687+
if (generateConstraints(target))
16881688
return false;
16891689

16901690
solveForCodeCompletion(solutions);

lib/Sema/CSSyntacticElement.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ class SyntacticElementConstraintGenerator
580580
forEachStmt, context.getAsDeclContext(),
581581
/*bindTypeVarsOneWay=*/false);
582582

583-
if (cs.generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
583+
if (cs.generateConstraints(target)) {
584584
hadError = true;
585585
return;
586586
}
@@ -734,7 +734,7 @@ class SyntacticElementConstraintGenerator
734734
if (isPlaceholderVar(patternBinding))
735735
return;
736736

737-
if (cs.generateConstraints(*target, FreeTypeVariableBinding::Disallow)) {
737+
if (cs.generateConstraints(*target)) {
738738
hadError = true;
739739
return;
740740
}
@@ -1128,7 +1128,7 @@ class SyntacticElementConstraintGenerator
11281128
contextualResultInfo.getType(),
11291129
/*isDiscarded=*/false);
11301130

1131-
if (cs.generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
1131+
if (cs.generateConstraints(target)) {
11321132
hadError = true;
11331133
return;
11341134
}
@@ -1430,7 +1430,7 @@ ConstraintSystem::simplifySyntacticElementConstraint(
14301430
contextInfo.purpose, contextInfo.getType(),
14311431
contextualTypeLoc, isDiscarded);
14321432

1433-
if (generateConstraints(target, FreeTypeVariableBinding::Disallow))
1433+
if (generateConstraints(target))
14341434
return SolutionKind::Error;
14351435

14361436
setSolutionApplicationTarget(expr, target);

0 commit comments

Comments
 (0)