Attempt to fix browser-wasm test failures. (#87680)

* Attempt to fix browser-wasm test failures. * Address feedback.
dotnet · Jun 16, 2023 · 76da696 · 76da696
1 parent 7bcf80a
commit 76da696
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/src/libraries/System.Text.Json/Common/ReflectionExtensions.cs b/src/libraries/System.Text.Json/Common/ReflectionExtensions.cs
@@ -221,19 +221,8 @@ public static bool IsVirtual(this PropertyInfo propertyInfo)
             return propertyInfo.GetMethod?.IsVirtual == true || propertyInfo.SetMethod?.IsVirtual == true;
         }
 
-        public static bool IsKeyValuePair(this Type type, Type? keyValuePairType = null)
-        {
-            if (!type.IsGenericType)
-            {
-                return false;
-            }
-
-            // Work around not being able to use typeof(KeyValuePair<,>) directly during compile-time src gen type analysis.
-            keyValuePairType ??= typeof(KeyValuePair<,>);
-
-            Type generic = type.GetGenericTypeDefinition();
-            return generic == keyValuePairType;
-        }
+        public static bool IsKeyValuePair(this Type type)
+            => type.IsGenericType && type.GetGenericTypeDefinition() == typeof(KeyValuePair<,>);
 
         public static bool TryGetDeserializationConstructor(
             [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]

diff --git a/....Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs b/....Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
@@ -39,11 +40,18 @@ public override bool CanConvert(Type typeToConvert)
             Justification = "The ctor is marked RequiresUnreferencedCode.")]
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
+            ConstructorInfo? constructor;
             JsonConverter converter;
             Type converterType;
 
-            bool useDefaultCtorInUnannotatedStructs = _useDefaultConstructorInUnannotatedStructs && !typeToConvert.IsKeyValuePair();
-            if (!typeToConvert.TryGetDeserializationConstructor(useDefaultCtorInUnannotatedStructs, out ConstructorInfo? constructor))
+            if (typeToConvert.IsKeyValuePair())
+            {
+                // browser-wasm compat -- ensure the linker doesn't trim away constructor parameter names from KVP.
+                Type[] genericArguments = typeToConvert.GetGenericArguments();
+                Type keyValuePairType = typeof(KeyValuePair<,>).MakeGenericType(genericArguments);
+                constructor = keyValuePairType.GetConstructor(genericArguments);
+            }
+            else if (!typeToConvert.TryGetDeserializationConstructor(_useDefaultConstructorInUnannotatedStructs, out constructor))
             {
                 ThrowHelper.ThrowInvalidOperationException_SerializationDuplicateTypeAttribute<JsonConstructorAttribute>(typeToConvert);
             }