From c9cb9bd6e50ea0d1f2a85840c7f08baf119eb9be Mon Sep 17 00:00:00 2001
From: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
Date: Fri, 1 Jul 2022 15:06:55 +0100
Subject: [PATCH] address feedback

---
 .../Metadata/JsonPropertyInfo.cs              | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
index 486fffd61f59fa..00c59fe5ea4f69 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/JsonPropertyInfo.cs
@@ -142,25 +142,7 @@ internal ICustomAttributeProvider? AttributeProvider
             {
                 VerifyMutable();
 
-                switch (_attributeProvider = value)
-                {
-                    case PropertyInfo propertyInfo:
-                        {
-                            MemberName = propertyInfo.Name;
-                            IsVirtual = propertyInfo.IsVirtual();
-                            MemberType = MemberTypes.Property;
-                            break;
-                        }
-                    case FieldInfo fieldInfo:
-                        {
-                            MemberName = fieldInfo.Name;
-                            MemberType = MemberTypes.Field;
-                            break;
-                        }
-                    default:
-                        // Don't set any metadata when value is unsupported MemberInfo type
-                        break;
-                }
+                _attributeProvider = value;
             }
         }
 
@@ -546,7 +528,26 @@ internal string GetDebugInfo(int indent = 0)
         internal void InitializeUsingMemberReflection(MemberInfo memberInfo)
         {
             Debug.Assert(AttributeProvider == null);
-            Debug.Assert(memberInfo is FieldInfo or PropertyInfo);
+
+            switch (AttributeProvider = memberInfo)
+            {
+                case PropertyInfo propertyInfo:
+                    {
+                        MemberName = propertyInfo.Name;
+                        IsVirtual = propertyInfo.IsVirtual();
+                        MemberType = MemberTypes.Property;
+                        break;
+                    }
+                case FieldInfo fieldInfo:
+                    {
+                        MemberName = fieldInfo.Name;
+                        MemberType = MemberTypes.Field;
+                        break;
+                    }
+                default:
+                    Debug.Fail("Only FieldInfo and PropertyInfo members are supported.");
+                    break;
+            }
 
             DeterminePoliciesFromMember(memberInfo);
             DeterminePropertyNameFromMember(memberInfo);
@@ -557,7 +558,6 @@ internal void InitializeUsingMemberReflection(MemberInfo memberInfo)
             }
 
             IsExtensionData = memberInfo.GetCustomAttribute<JsonExtensionDataAttribute>(inherit: false) != null;
-            AttributeProvider = memberInfo;
         }
 
         internal bool IgnoreDefaultValuesOnRead { get; private set; }