CSHARP-5633: BsonSerializer.IsTypeDiscriminated is not thread-safe

src/MongoDB.Bson/Serialization/BsonSerializer.cs

@@ -39,7 +39,7 @@ public static class BsonSerializer
         private static Dictionary<Type, IIdGenerator> __idGenerators = new Dictionary<Type, IIdGenerator>();
         private static Dictionary<Type, IDiscriminatorConvention> __discriminatorConventions = new Dictionary<Type, IDiscriminatorConvention>();
         private static Dictionary<BsonValue, HashSet<Type>> __discriminators = new Dictionary<BsonValue, HashSet<Type>>();
-        private static HashSet<Type> __discriminatedTypes = new HashSet<Type>();
+        private static ConcurrentDictionary<Type, bool> __discriminatedTypes = new ();
         private static BsonSerializerRegistry __serializerRegistry;
         private static TypeMappingSerializationProvider __typeMappingSerializationProvider;
         // ConcurrentDictionary<Type, object> is being used as a concurrent set of Type. The values will always be null.
@@ -321,8 +321,7 @@ internal static bool IsDiscriminatorConventionRegisteredAtThisLevel(Type type)
         /// <returns>True if the type is discriminated.</returns>
         public static bool IsTypeDiscriminated(Type type)
         {
-            var typeInfo = type.GetTypeInfo();
-            return typeInfo.IsInterface || __discriminatedTypes.Contains(type);
+            return type.GetTypeInfo().IsInterface || __discriminatedTypes.ContainsKey(type);
         }
 
         /// <summary>
@@ -587,7 +586,7 @@ public static void RegisterDiscriminator(Type type, BsonValue discriminator)
                     // mark all base types as discriminated (so we know that it's worth reading a discriminator)
                     for (var baseType = typeInfo.BaseType; baseType != null; baseType = baseType.GetTypeInfo().BaseType)
                     {
-                        __discriminatedTypes.Add(baseType);
+                        __discriminatedTypes.TryAdd(baseType, true);
                     }
                 }
             }