Skip to content

Commit 89c499e

Browse files
committed
[ConstraintSystem] Remove default argument for updateWorkList from
ConstraintSystem::mergeEquivalenceClasses. Most callers don't use the default, and it's important to consider the value of this argument for each call to mergeEquivalenceClasses.
1 parent 4096a62 commit 89c499e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/Sema/CSSimplify.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4529,7 +4529,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
45294529
return formUnsolvedResult();
45304530

45314531
// Merge the equivalence classes corresponding to these two variables.
4532-
mergeEquivalenceClasses(rep1, rep2);
4532+
mergeEquivalenceClasses(rep1, rep2, /*updateWorkList=*/true);
45334533
return getTypeMatchSuccess();
45344534
}
45354535

@@ -4581,7 +4581,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
45814581
if (!rep1->getImpl().canBindToInOut() ||
45824582
!rep2->getImpl().canBindToLValue()) {
45834583
// Merge the equivalence classes corresponding to these two variables.
4584-
mergeEquivalenceClasses(rep1, rep2);
4584+
mergeEquivalenceClasses(rep1, rep2, /*updateWorkList=*/true);
45854585
return getTypeMatchSuccess();
45864586
}
45874587
}

lib/Sema/ConstraintSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3443,7 +3443,7 @@ class ConstraintSystem {
34433443
/// distinct.
34443444
void mergeEquivalenceClasses(TypeVariableType *typeVar1,
34453445
TypeVariableType *typeVar2,
3446-
bool updateWorkList = true);
3446+
bool updateWorkList);
34473447

34483448
/// Flags that direct type matching.
34493449
enum TypeMatchFlags {

0 commit comments

Comments
 (0)