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

[Diagnostics] Properly diagnose assignment type mismatches when either side is optional

Browse Source
This commit is contained in:
Pavel Yaskevich
2019-10-28 16:06:11 -07:00
parent bba785a7ac
commit 3586af6e8a
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Sema/CSDiagnostics.cpp
View File

@@ -774,6 +774,9 @@ bool GenericArgumentsMismatchFailure::diagnoseAsError() {
auto *anchor = getAnchor();
auto path = getLocator()->getPath();
auto fromType = getFromType();
auto toType = getToType();
Optional<Diag<Type, Type>> diagnostic;
if (path.empty()) {
if (isa<AssignExpr>(anchor)) {
@@ -810,6 +813,16 @@ bool GenericArgumentsMismatchFailure::diagnoseAsError() {
break;
}
case ConstraintLocator::GenericArgument: {
// In cases like `[[Int]]` vs. `[[String]]`
if (auto *assignExpr = dyn_cast<AssignExpr>(anchor)) {
diagnostic = getDiagnosticFor(CTP_AssignSource);
fromType = getType(assignExpr->getSrc());
toType = getType(assignExpr->getDest());
}
break;
}
default:
return false;
}
@@ -818,7 +831,7 @@ bool GenericArgumentsMismatchFailure::diagnoseAsError() {
if (!diagnostic)
return false;
emitDiagnostic(anchor->getLoc(), *diagnostic, getFromType(), getToType());
emitDiagnostic(anchor->getLoc(), *diagnostic, fromType, toType);
emitNotesForMismatches();
return true;
}