Fix bug in handling of duplicate properties in the fast-path source g…

…enerator. (dotnet#105628)
adamsitnik · Jul 29, 2024 · f2d2fac · f2d2fac
1 parent f251b17
commit f2d2fac
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Parser.cs b/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Parser.cs
@@ -1049,7 +1049,7 @@ private static void AddPropertyWithConflictResolution(
                     {
                         // Overwrite previously cached property since it has [JsonIgnore].
                         state.AddedProperties[propertySpec.EffectiveJsonPropertyName] = (propertySpec, memberInfo, index);
-                        state.Properties[index] = state.Properties.Count;
+                        state.Properties[index] = propertyIndex;
                         state.IsPropertyOrderSpecified |= propertySpec.Order != 0;
                     }
                     else

diff --git a/...stem.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/SerializationContextTests.cs b/...stem.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/SerializationContextTests.cs
@@ -56,6 +56,7 @@ namespace System.Text.Json.SourceGeneration.Tests
     [JsonSerializable(typeof(PolymorphicClass))]
     [JsonSerializable(typeof(PocoWithNumberHandlingAttr))]
     [JsonSerializable(typeof(PocoWithMixedVisibilityMembers))]
+    [JsonSerializable(typeof(ClassWithConflictingIgnoredProperties))]
     internal partial class SerializationContext : JsonSerializerContext, ITestContext
     {
         public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Serialization;
@@ -556,6 +557,31 @@ public override void NullableStruct()
 
             Assert.Throws<InvalidOperationException>(() => JsonSerializer.Deserialize(json, DefaultContext.NullablePersonStruct));
         }
+
+        [Fact]
+        public void ClassWithConflictingIgnoredProperties_FastPathSerialization()
+        {
+            // Regression test for https://github.com/dotnet/runtime/issues/99988
+
+            ClassWithConflictingIgnoredProperties value = new()
+            {
+                SystemTextJsonUserList = ["root"],
+                SystemTextJsonUserGroupsList = ["wheel"],
+                SystemTextJsonIPAddresses = ["127.0.0.1"],
+                SystemTextJsonQueryParams = ["key=value"],
+            };
+
+            string json = JsonSerializer.Serialize(value, SerializationContext.Default.ClassWithConflictingIgnoredProperties);
+
+            JsonTestHelper.AssertJsonEqual("""
+                {
+                    "userlist" : ["root"],
+                    "usergroupslist" : ["wheel"],
+                    "SystemTextJsonIPAddresses" : ["127.0.0.1"],
+                    "queryparams" : ["key=value"]
+                }
+                """, json);
+        }
     }
 
     public sealed class SerializationWithPerTypeAttributeContextTests : SerializationContextTests

diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/TestClasses.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/TestClasses.cs
@@ -333,4 +333,28 @@ public class PocoWithMixedVisibilityMembers : PocoWithMixedVisibilityMembersBase
 
         public new int ShadowProperty { get; set; }
     }
+
+    public sealed class ClassWithConflictingIgnoredProperties
+    {
+        [JsonIgnore]
+        public List<string>? UserList { get; set; }
+
+        [JsonPropertyName("userlist")]
+        public List<string>? SystemTextJsonUserList { get; set; }
+
+        [JsonIgnore]
+        public List<string>? UserGroupsList { get; set; }
+
+        [JsonPropertyName("usergroupslist")]
+        public List<string>? SystemTextJsonUserGroupsList { get; set; }
+
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+        public List<string>? SystemTextJsonIPAddresses { get; set; }
+
+        [JsonIgnore]
+        public List<object>? QueryParams { get; set; }
+
+        [JsonPropertyName("queryparams")]
+        public List<object>? SystemTextJsonQueryParams { get; set; }
+    }
 }