Skip to content

Commit bb072a3

Browse files
authored
Merge pull request swiftlang#36189 from xedin/solver-cleanups
[ConstraintSystem] Remove unused default parameter from `ConstraintSy…
2 parents 8e0a260 + bcd58ed commit bb072a3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/swift/Sema/ConstraintSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4626,7 +4626,7 @@ class ConstraintSystem {
46264626
/// no fixed type. Such type variables are left to the solver to bind.
46274627
///
46284628
/// \returns true if an error occurred, false otherwise.
4629-
bool simplify(bool ContinueAfterFailures = false);
4629+
bool simplify();
46304630

46314631
/// Simplify the given constraint.
46324632
SolutionKind simplifyConstraint(const Constraint &constraint);

lib/Sema/CSSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void ConstraintSystem::restoreTypeVariableBindings(unsigned numBindings) {
298298
savedBindings.end());
299299
}
300300

301-
bool ConstraintSystem::simplify(bool ContinueAfterFailures) {
301+
bool ConstraintSystem::simplify() {
302302
// While we have a constraint in the worklist, process it.
303303
while (!ActiveConstraints.empty()) {
304304
// Grab the next constraint from the worklist.
@@ -324,7 +324,7 @@ bool ConstraintSystem::simplify(bool ContinueAfterFailures) {
324324
}
325325

326326
// Check whether a constraint failed. If so, we're done.
327-
if (failedConstraint && !ContinueAfterFailures) {
327+
if (failedConstraint) {
328328
return true;
329329
}
330330

0 commit comments

Comments
 (0)