averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Constraint system] Drop the root expression from FailureDiagnostic.

Browse Source 
We're not using it for anything, now.
This commit is contained in:
Doug Gregor
2019-11-08 22:38:49 -08:00
parent 3fbdac5190
commit bc926f7eb7
8 changed files with 299 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/CSDiagnostics.cpp
View File

@@ -1546,7 +1546,7 @@ bool TrailingClosureAmbiguityFailure::diagnoseAsNote() {
AssignmentFailure::AssignmentFailure(Expr *destExpr, ConstraintSystem &cs,
SourceLoc diagnosticLoc)
: FailureDiagnostic(destExpr, cs, cs.getConstraintLocator(destExpr)),
: FailureDiagnostic(cs, cs.getConstraintLocator(destExpr)),
DestExpr(destExpr),
Loc(diagnosticLoc),
DeclDiagnostic(findDeclDiagonstic(cs.getASTContext(), destExpr)),
@@ -3556,7 +3556,7 @@ bool AllowTypeOrInstanceMemberFailure::diagnoseAsError() {
// components, let's provide a tailored diagnostic and return because
// that is unsupported so there is no fix-it.
if (locator->isForKeyPathComponent()) {
InvalidStaticMemberRefInKeyPath failure(expr, cs, Member, locator);
InvalidStaticMemberRefInKeyPath failure(cs, Member, locator);
return failure.diagnoseAsError();
}
@@ -5536,7 +5536,7 @@ bool ArgumentMismatchFailure::diagnoseMisplacedMissingArgument() const {
auto *anchor = getRawAnchor();
MissingArgumentsFailure failure(
getParentExpr(), cs, {param.withType(argType)},
cs, {param.withType(argType)},
cs.getConstraintLocator(anchor, ConstraintLocator::ApplyArgument));
return failure.diagnoseSingleMissingArgument();