Check for BackingField instead of IsAutoProperty in NullableWalker (#…

…75872)
dotnet · Nov 21, 2024 · 9b2cd5d · 9b2cd5d
1 parent 1207044
commit 9b2cd5d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs b/src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs
@@ -971,7 +971,7 @@ static IEnumerable<Symbol> getAllMembersToBeDefaulted(Symbol requiredMember)
                         }
 
                         static Symbol getFieldSymbolToBeInitialized(Symbol requiredMember)
-                            => requiredMember is SourcePropertySymbol { IsAutoProperty: true } prop ? prop.BackingField : requiredMember;
+                            => requiredMember is SourcePropertySymbolBase { BackingField: { } backingField } ? backingField : requiredMember;
                     }
                 }
             }

diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/RequiredMembersTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/RequiredMembersTests.cs
@@ -4517,17 +4517,19 @@ public C(bool unused) : this()
         );
     }
 
-    [Fact, CompilerTrait(CompilerFeature.NullableReferenceTypes)]
+    [Theory, CompilerTrait(CompilerFeature.NullableReferenceTypes)]
     [WorkItem(6754, "https://github.com/dotnet/csharplang/issues/6754")]
-    public void RequiredMemberSuppressesNullabilityWarnings_MemberNotNull_ChainedConstructor_03()
+    [InlineData("public string Property2 { get; set; }")]
+    [InlineData("public string Property2 { get => field; set => field = value; }")]
+    public void RequiredMemberSuppressesNullabilityWarnings_MemberNotNull_ChainedConstructor_03(string property2Definition)
     {
-        var code = """
+        var code = $$"""
 using System.Diagnostics.CodeAnalysis;
 #nullable enable
 class C
 {
     public required string Property1 { get => Property2; [MemberNotNull(nameof(Property2))] set => Property2 = value; }
-    public string Property2 { get; set; }
+    {{property2Definition}}
 
     public C() { }
     public C(bool unused) : this()
@@ -4549,17 +4551,19 @@ public C(bool unused) : this()
         );
     }
 
-    [Fact, CompilerTrait(CompilerFeature.NullableReferenceTypes)]
+    [Theory, CompilerTrait(CompilerFeature.NullableReferenceTypes)]
     [WorkItem(6754, "https://github.com/dotnet/csharplang/issues/6754")]
-    public void RequiredMemberSuppressesNullabilityWarnings_MemberNotNull_ChainedConstructor_04()
+    [InlineData("public string Property2 { get; set; }")]
+    [InlineData("public string Property2 { get => field; set => field = value; }")]
+    public void RequiredMemberSuppressesNullabilityWarnings_MemberNotNull_ChainedConstructor_04(string property2Definition)
     {
-        var code = """
+        var code = $$"""
 using System.Diagnostics.CodeAnalysis;
 #nullable enable
 class C
 {
     public required string Property1 { get => Property2; [MemberNotNull(nameof(Property2))] set => Property2 = value; }
-    public string Property2 { get; set; }
+    {{property2Definition}}
 
     public C() { }
     [SetsRequiredMembers]
-Original file line number
+Diff line change
@@ Expand Up @@
                             }
                             static Symbol getFieldSymbolToBeInitialized(Symbol requiredMember)
-                                => requiredMember is SourcePropertySymbol { IsAutoProperty: true } prop ? prop.BackingField : requiredMember;
+                                => requiredMember is SourcePropertySymbolBase { BackingField: { } backingField } ? backingField : requiredMember;
                         }
                     }
                 }
@@ Expand Down @@