Address various minor param-nullchecking issues #58321
Merged
Conversation
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
jaredpar
approved these changes
Dec 14, 2021
| IL_0002: newobj ""C.<GetChars>d__0..ctor(int)"" | ||
| IL_0007: ldarg.1 | ||
| IL_0008: ldstr ""s"" | ||
| IL_000d: call ""ThrowIfNull"" |
There was a problem hiding this comment.
I was a bit surprised to see us create the state machine then do the null check. Given that we do the null check before calling base / this ctor would've expected the null check first here.
Not blocking if everyone else feels that way, can deal with it in a follow up.
There was a problem hiding this comment.
A few test plan items are marked "address after merge". I think it would be fine to add a similar item to the test plan #36024 to see if we can improve this.
Youssef1313
reviewed
Dec 14, 2021
Comment on lines
1816
to
1833
| [Fact] | ||
| public void Override_NullCheckedDifference() | ||
| { | ||
| var source = | ||
| @" | ||
| class Base | ||
| { | ||
| public virtual void M1(string x!!) { } | ||
| public virtual void M2(string x) { } | ||
| } | ||
|
|
||
| class Derived : Base | ||
| { | ||
| public override void M1(string x) { } | ||
| public override void M2(string x!!) { } | ||
| }"; | ||
| var verifier = CompileAndVerify(source); | ||
| verifier.VerifyDiagnostics(); |
There was a problem hiding this comment.
Not sure if it does make sense to also run this test with NRT enabled and still ensure no nullable-related warnings are produced?
There was a problem hiding this comment.
Sounds good. Done.
cston
reviewed
Dec 14, 2021
src/Compilers/CSharp/Test/Semantic/Semantics/NullCheckedParameterTests.cs
Show resolved
Hide resolved
cston
reviewed
Dec 14, 2021
src/Compilers/CSharp/Test/Semantic/Semantics/NullCheckedParameterTests.cs
Show resolved
Hide resolved
cston
reviewed
Dec 14, 2021
| @@ -7977,7 +7986,7 @@ private void VisitThisOrBaseReference(BoundExpression node) | |||
| var parameter = node.ParameterSymbol; | |||
| int slot = GetOrCreateSlot(parameter); | |||
| var parameterType = GetDeclaredParameterResult(parameter); | |||
| var typeWithState = GetParameterState(parameterType, parameter.FlowAnalysisAnnotations); | |||
| var typeWithState = GetParameterState(parameterType, parameter.FlowAnalysisAnnotations, parameter.IsNullChecked); | |||
There was a problem hiding this comment.
Oop, I might not have addressed this. Looking.
There was a problem hiding this comment.
I think there's not an obvious scenario where we can observe a behavior difference so I'm not going to add specific tests for it at this time.
cston
reviewed
Dec 14, 2021
src/Compilers/CSharp/Test/Emit2/CodeGen/CodeGenNullCheckedParameterTests.cs
Show resolved
Hide resolved
cston
approved these changes
Dec 14, 2021
333fred
added a commit
to 333fred/roslyn
that referenced
this pull request
Dec 16, 2021
…rations * upstream/main: (87 commits) Add support for nullable analysis in interpolated string handler constructors (dotnet#57780) Record list-patterns and newlines in interpolations as done (dotnet#58250) Swithc to acquiring the component model on a BG thread. Fix failure to propagate cancellation token [main] Update dependencies from dotnet/arcade (dotnet#58327) Change PROTOTYPE to issue reference (dotnet#58336) Resolve PROTOTYPE comments in param null checking (dotnet#58324) Address various minor param-nullchecking issues (dotnet#58321) Nullable enable GetTypeByMetadataName (dotnet#58317) Support CodeClass2.Parts returning parts in source generated files Allow the FileCodeModel.Parent to be null Ensure the CodeModel tests are using VisualStudioWorkspaceImpl Fix the bad words in TestDeepAlternation Fix regression in Equals/GetHashCode of LambdaSymbol. (dotnet#58247) Support "Enable nullable reference types" from disable keyword Support "Enable nullable reference types" from restore keyword Support "Enable nullable reference types" on the entire directive Add comment Remove descriptor Update src/Workspaces/Remote/ServiceHub/Services/SemanticClassification/RemoteSemanticClassificationService.cs ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
string? s!!a warning just asint? x!!is a warning. notes!!. Test plan for "Parameter null-checking" #36024 (comment)