Skip to content
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.

Sign up for GitHub

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

Update argument state when parameter has not-null type #46072

Merged
merged 11 commits into from
Jul 28, 2020
Merged

Update argument state when parameter has not-null type #46072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
979b215
Update argument state when parameter has not-null type
RikkiGibson Jul 15, 2020
a298c6f
Fix tests
RikkiGibson Jul 17, 2020
35b2049
Address 'notnull' constraint. Add more tests.
RikkiGibson Jul 20, 2020
21fb29e
Fix baseline
RikkiGibson Jul 20, 2020
fe67bd0
Revert parameterOriginalDefinition change
RikkiGibson Jul 24, 2020
3b1347c
Merge branch 'master' of github.com:dotnet/roslyn into notnull-param-…
RikkiGibson Jul 24, 2020
0454260
Fix tests
RikkiGibson Jul 24, 2020
f602045
Merge branch 'master' of github.com:dotnet/roslyn into notnull-param-…
RikkiGibson Jul 26, 2020
c2c725f
Update test
RikkiGibson Jul 26, 2020
790899e
Address feedback
RikkiGibson Jul 27, 2020
8070a25
Address feedback
RikkiGibson Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4955,7 +4955,7 @@ private void VisitArgumentOutboundAssignmentsAndPostConditions(
case RefKind.In:
{
// learn from post-conditions [Maybe/NotNull, Maybe/NotNullWhen] without using an assignment
learnFromPostConditions(argument, parameterAnnotations);
learnFromPostConditions(argument, parameterType, parameterAnnotations);
}
break;
case RefKind.Ref:
Expand Down Expand Up @@ -5139,11 +5139,15 @@ static TypeWithState applyPostConditionsWhenFalse(TypeWithState typeWithState, F
return typeWithState;
}

void learnFromPostConditions(BoundExpression argument, FlowAnalysisAnnotations parameterAnnotations)
void learnFromPostConditions(BoundExpression argument, TypeWithAnnotations parameterType, FlowAnalysisAnnotations parameterAnnotations)
{
// Note: NotNull = NotNullWhen(true) + NotNullWhen(false)
bool notNullWhenTrue = (parameterAnnotations & FlowAnalysisAnnotations.NotNullWhenTrue) != 0;
bool notNullWhenFalse = (parameterAnnotations & FlowAnalysisAnnotations.NotNullWhenFalse) != 0;
bool disallowNull = (parameterAnnotations & FlowAnalysisAnnotations.DisallowNull) != 0;
bool setNotNullFromParameterType = !argument.IsSuppressed
&& !parameterType.Type.IsPossiblyNullableReferenceTypeTypeParameter()
&& parameterType.NullableAnnotation.IsNotAnnotated();

// Note: MaybeNull = MaybeNullWhen(true) + MaybeNullWhen(false)
bool maybeNullWhenTrue = (parameterAnnotations & FlowAnalysisAnnotations.MaybeNullWhenTrue) != 0;
Expand All @@ -5153,7 +5157,9 @@ void learnFromPostConditions(BoundExpression argument, FlowAnalysisAnnotations p
{
LearnFromNullTest(argument, ref State);
}
else if (notNullWhenTrue && notNullWhenFalse && !IsConditionalState && !(maybeNullWhenTrue && maybeNullWhenFalse))
else if (((notNullWhenTrue && notNullWhenFalse) || disallowNull || setNotNullFromParameterType)
&& !IsConditionalState
&& !(maybeNullWhenTrue || maybeNullWhenFalse))
{
LearnFromNonNullTest(argument, ref State);
}
Expand Down
Loading