Skip to content

[Constraint system] Drop expression from diagnoseAmbiguityWithFixes. #28265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2019
Merged

[Constraint system] Drop expression from diagnoseAmbiguityWithFixes. #28265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
670ff7d
[Constrant system] Drop expression from diagnoseAmbiguityWithFixes.
DougGregor Nov 9, 2019
4c2a7bf
Revert "[Constraint solver] Be more careful about NULL parent express…
DougGregor Nov 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Sema/CSDiagnostics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ bool MissingConformanceFailure::diagnoseAsAmbiguousOperatorRef() {
// about missing conformance just in case.
auto operatorID = name.getIdentifier();

auto *applyExpr = cast_or_null<ApplyExpr>(findParentExpr(anchor));
auto *applyExpr = cast<ApplyExpr>(findParentExpr(anchor));
if (auto *binaryOp = dyn_cast<BinaryExpr>(applyExpr)) {
auto lhsType = getType(binaryOp->getArg()->getElement(0));
auto rhsType = getType(binaryOp->getArg()->getElement(1));
Expand Down
4 changes: 2 additions & 2 deletions lib/Sema/ConstraintSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2425,7 +2425,7 @@ bool ConstraintSystem::salvage(SmallVectorImpl<Solution> &viable, Expr *expr) {

// Before removing any "fixed" solutions, let's check
// if ambiguity is caused by fixes and diagnose if possible.
if (diagnoseAmbiguityWithFixes(expr, viable))
if (diagnoseAmbiguityWithFixes(viable))
return true;

// FIXME: If we were able to actually fix things along the way,
Expand Down Expand Up @@ -2529,7 +2529,7 @@ static void diagnoseOperatorAmbiguity(ConstraintSystem &cs,
}

bool ConstraintSystem::diagnoseAmbiguityWithFixes(
Expr *expr, ArrayRef<Solution> solutions) {
ArrayRef<Solution> solutions) {
if (solutions.empty())
return false;

Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/ConstraintSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2108,7 +2108,7 @@ class ConstraintSystem {
void diagnoseFailureForExpr(Expr *expr);

bool diagnoseAmbiguity(Expr *expr, ArrayRef<Solution> solutions);
bool diagnoseAmbiguityWithFixes(Expr *expr, ArrayRef<Solution> solutions);
bool diagnoseAmbiguityWithFixes(ArrayRef<Solution> solutions);

/// Give the deprecation warning for referring to a global function
/// when there's a method from a conditional conformance in a smaller/closer
Expand Down