-
Notifications
You must be signed in to change notification settings - Fork 4k
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.
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
Handle nullability attributes in param-nullchecking #59393
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
48e5ecb
Handle nullability attributes in param-nullchecking
RikkiGibson 07e63fc
fix
RikkiGibson 3618a98
Avoid breaking 'TestNullableGenericsImplementingGenericAbstractClass'
RikkiGibson aa6f565
More tests
RikkiGibson 0d8c58d
Address feedback
RikkiGibson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -809,15 +809,43 @@ internal static void ReportParameterNullCheckingErrors(DiagnosticBag diagnostics | |
{ | ||
diagnostics.Add(ErrorCode.ERR_DiscardCannotBeNullChecked, location); | ||
} | ||
if (parameter.TypeWithAnnotations.NullableAnnotation.IsAnnotated() | ||
|| parameter.Type.IsNullableTypeOrTypeParameter()) | ||
|
||
var annotations = parameter.FlowAnalysisAnnotations; | ||
if ((annotations & FlowAnalysisAnnotations.NotNull) == 0 | ||
&& NullableWalker.GetParameterState(parameter.TypeWithAnnotations, annotations, applyParameterNullCheck: false).State.MayBeNull() | ||
&& !isTypeParameterWithPossiblyNonNullableType(parameter.TypeWithAnnotations, annotations)) | ||
{ | ||
diagnostics.Add(ErrorCode.WRN_NullCheckingOnNullableType, location, parameter); | ||
} | ||
else if (parameter.Type.IsValueType && !parameter.Type.IsPointerOrFunctionPointer()) | ||
|
||
if (parameter.Type.IsNonNullableValueType() && !parameter.Type.IsPointerOrFunctionPointer()) | ||
{ | ||
diagnostics.Add(ErrorCode.ERR_NonNullableValueTypeIsNullChecked, location, parameter); | ||
} | ||
|
||
// For type parameters, we only want to give the warning if no type argument would result in a non-nullable type. | ||
static bool isTypeParameterWithPossiblyNonNullableType(TypeWithAnnotations typeWithAnnotations, FlowAnalysisAnnotations annotations) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks, that was much easier to follow :-) |
||
{ | ||
if (!typeWithAnnotations.Type.IsTypeParameter()) | ||
{ | ||
return false; | ||
} | ||
|
||
// We avoid checking the nullable annotations, etc. of constraints due to implementation complexity, | ||
// and consider it acceptable to miss "!! on nullable type" warnings in scenarios like `void M<T, U>(U u!!) where U : T?`. | ||
if (typeWithAnnotations.NullableAnnotation.IsAnnotated()) | ||
{ | ||
return false; | ||
} | ||
|
||
// `void M<T>([AllowNull] T t!!)` | ||
if ((annotations & FlowAnalysisAnnotations.AllowNull) != 0) | ||
{ | ||
return false; | ||
} | ||
|
||
return true; | ||
} | ||
} | ||
|
||
internal static ImmutableArray<CustomModifier> ConditionallyCreateInModifiers(RefKind refKind, bool addRefReadOnlyModifier, Binder binder, BindingDiagnosticBag diagnostics, SyntaxNode syntax) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tend to dislike
if (...) { warn } else if (...) { error }
conditions anyway--can be a bit brittle.