Skip to content

Commit 78e360a

Browse files
committed
[Constraint solver] Drop unused Expr* from diagnoseAmbiguity().
We've made this unnecessary.
1 parent 6273941 commit 78e360a

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

lib/Sema/ConstraintSystem.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2503,7 +2503,7 @@ bool ConstraintSystem::salvage(SmallVectorImpl<Solution> &viable, Expr *expr) {
25032503
}
25042504
}
25052505

2506-
if (diagnoseAmbiguity(expr, viable)) {
2506+
if (diagnoseAmbiguity(viable)) {
25072507
return true;
25082508
}
25092509
}
@@ -2757,8 +2757,7 @@ static void extendPreorderIndexMap(
27572757
expr->walk(traversal);
27582758
}
27592759

2760-
bool ConstraintSystem::diagnoseAmbiguity(Expr *expr,
2761-
ArrayRef<Solution> solutions) {
2760+
bool ConstraintSystem::diagnoseAmbiguity(ArrayRef<Solution> solutions) {
27622761
// Produce a diff of the solutions.
27632762
SolutionDiff diff(solutions);
27642763

lib/Sema/ConstraintSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,7 @@ class ConstraintSystem {
21042104
/// emits an error message.
21052105
void diagnoseFailureForExpr(Expr *expr);
21062106

2107-
bool diagnoseAmbiguity(Expr *expr, ArrayRef<Solution> solutions);
2107+
bool diagnoseAmbiguity(ArrayRef<Solution> solutions);
21082108
bool diagnoseAmbiguityWithFixes(ArrayRef<Solution> solutions);
21092109

21102110
/// Give the deprecation warning for referring to a global function

0 commit comments

Comments
 (0)