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

Merge pull request #74564 from gottesmm/pr-9be87019f95149167c2e03043b7a86b82f9d282c

Browse Source 
Follow up fixes with feedback from #74129
This commit is contained in:
Michael Gottesman
2024-06-25 10:24:26 -07:00
committed by GitHub
parent 0c7621d282 9b0e0f5010
commit 56cb980540
5 changed files with 38 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Sema/CSDiagnostics.cpp
View File

@@ -7919,21 +7919,25 @@ bool NonEphemeralConversionFailure::diagnoseAsError() {
return true;
}
bool SendingOnFunctionParameterMismatchFail::diagnoseAsError() {
emitDiagnosticAt(getLoc(), diag::sending_function_wrong_sending,
getFromType(), getToType())
bool SendingMismatchFailure::diagnoseAsError() {
if (getLocator()->getLastElementAs<LocatorPathElt::FunctionArgument>())
return diagnoseArgFailure();
return diagnoseResultFailure();
}
bool SendingMismatchFailure::diagnoseArgFailure() {
emitDiagnostic(diag::sending_function_wrong_sending, getFromType(),
getToType())
.warnUntilSwiftVersion(6);
emitDiagnosticAt(getLoc(),
diag::sending_function_param_with_sending_param_note);
emitDiagnostic(diag::sending_function_param_with_sending_param_note);
return true;
}
bool SendingOnFunctionResultMismatchFailure::diagnoseAsError() {
emitDiagnosticAt(getLoc(), diag::sending_function_wrong_sending,
getFromType(), getToType())
bool SendingMismatchFailure::diagnoseResultFailure() {
emitDiagnostic(diag::sending_function_wrong_sending, getFromType(),
getToType())
.warnUntilSwiftVersion(6);
emitDiagnosticAt(getLoc(),
diag::sending_function_result_with_sending_param_note);
emitDiagnostic(diag::sending_function_result_with_sending_param_note);
return true;
}