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

Allow suppressing foreach iteration variable nullability mismatch #75432

Merged
merged 3 commits into from
Oct 31, 2024
Merged

Allow suppressing foreach iteration variable nullability mismatch #75432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
557c837
Allow suppressing foreach iteration variable
jjonescz Oct 8, 2024
612f795
Unify `suppressed` local and parameter
jjonescz Oct 17, 2024
c1b5fbf
Merge branch 'main' into 75430-ForeachNullSuppression
jjonescz Oct 31, 2024
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
6 changes: 4 additions & 2 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 @@ -244,7 +244,7 @@ internal string GetDebuggerDisplay()
/// <summary>
/// Map from a target-typed expression (such as a target-typed conditional, switch or new) to the delegate
/// that completes analysis once the target type is known.
/// The delegate is invoked by <see cref="VisitConversion(BoundConversion, BoundExpression, Conversion, TypeWithAnnotations, TypeWithState, bool, bool, bool, AssignmentKind, ParameterSymbol, bool, bool, bool, Optional&lt;LocalState&gt;,bool, Location, ArrayBuilder&lt;VisitResult&gt;)"/>.
/// The delegate is invoked by <see cref="VisitConversion(BoundConversion, BoundExpression, Conversion, TypeWithAnnotations, TypeWithState, bool, bool, bool, AssignmentKind, ParameterSymbol, bool, bool, bool, bool, Optional&lt;LocalState&gt;,bool, Location, ArrayBuilder&lt;VisitResult&gt;)"/>.
/// </summary>
private PooledDictionary<BoundExpression, Func<TypeWithAnnotations, TypeWithState>> TargetTypedAnalysisCompletion
=> _targetTypedAnalysisCompletionOpt ??= PooledDictionary<BoundExpression, Func<TypeWithAnnotations, TypeWithState>>.GetInstance();
Expand Down Expand Up @@ -8662,6 +8662,7 @@ private TypeWithState VisitConversion(
ParameterSymbol? parameterOpt = null,
bool reportTopLevelWarnings = true,
bool reportRemainingWarnings = true,
bool suppressed = false,
bool extensionMethodThisArgument = false,
Optional<LocalState> stateForLambda = default,
bool trackMembers = false,
Expand Down Expand Up @@ -8703,7 +8704,7 @@ private TypeWithState VisitConversion(
bool canConvertNestedNullability = true;
bool isSuppressed = false;

if (conversionOperand.IsSuppressed == true)
if (suppressed || conversionOperand.IsSuppressed)
Copy link
Member

@jcouv jcouv Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you share some details on the set up of the situation? I gather that we have two stacked conversions that are not part of the same conversion group and the operand is suppressed, but I don't understand why.
If this setup is expected, should we just dig through conversions here when looking for the IsSuppressed flag? #Closed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are getting here from VisitForEachIterationVariables where we call VisitConversion on node.IterationVariableType - there is no suppression in that node subtree. The suppression is in the node.Expression subtree.

Note that the pre-existing ref case similarly checks for suppression via node.Expression is not BoundConversion { Operand.IsSuppressed: true }.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to unify the suppressed parameter with the isSuppressed local?

{
reportTopLevelWarnings = false;
reportRemainingWarnings = false;
Expand Down Expand Up @@ -10975,6 +10976,7 @@ public override void VisitForEachIterationVariables(BoundForEachStatement node)
AssignmentKind.ForEachIterationVariable,
reportTopLevelWarnings: true,
reportRemainingWarnings: true,
suppressed: node.Expression is BoundConversion { Operand.IsSuppressed: true },
diagnosticLocation: variableLocation);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90888,15 +90888,15 @@ static class Extensions
comp.VerifyDiagnostics();
}

[Fact]
[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/75430")]
public void Foreach_NullableElementType_Suppression()
{
var source = """
#nullable enable
class C
{
void M1(object?[] a) { foreach (object item in a) { } }
void M2(object[] a) { foreach (object item in a!) { } }
void M2(object?[] a) { foreach (object item in a!) { } }
}
""";
CreateCompilation(source).VerifyDiagnostics(
Expand Down