From 687c5e4738d7e574f918db5b23319ae1ef1040a8 Mon Sep 17 00:00:00 2001
From: Sylvain Audi <sylvain.audi@ubisoft.com>
Date: Fri, 13 Sep 2024 16:02:50 -0400
Subject: [PATCH] Simplify and fix PlatformRegistry dictionary of
 implementation instances

---
 Sharpmake/PlatformRegistry.cs | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/Sharpmake/PlatformRegistry.cs b/Sharpmake/PlatformRegistry.cs
index 561914796..e255a0f14 100644
--- a/Sharpmake/PlatformRegistry.cs
+++ b/Sharpmake/PlatformRegistry.cs
@@ -66,7 +66,7 @@ public int GetHashCode(PlatformImplementation obj)
 
         private static readonly ConcurrentDictionary<PlatformImplementation, object> s_implementations = new ConcurrentDictionary<PlatformImplementation, object>(new PlatformImplementationComparer());
         private static readonly ConcurrentDictionary<Type, object> s_defaultImplementations = new ConcurrentDictionary<Type, object>();
-        private static readonly ConcurrentDictionary<object, bool> s_implementationInstances = new ConcurrentDictionary<object, bool>(); // Value is dummy
+        private static readonly ConcurrentDictionary<Type, object> s_implementationInstances = new ConcurrentDictionary<Type, object>();
         private static readonly ConcurrentDictionary<Assembly, bool> s_parsedAssemblies = new ConcurrentDictionary<Assembly, bool>(); // Value is dummy
 
         static PlatformRegistry()
@@ -499,26 +499,7 @@ private static void EnsureUniquePlatformImplementations(IEnumerable<PlatformImpl
 
         private static object GetImplementationInstance(Type implType)
         {
-            var result = s_implementationInstances.SingleOrDefault(obj => obj.GetType().AssemblyQualifiedName == implType.AssemblyQualifiedName);
-            object instance = null;
-            if (result.Key == null)
-            {
-                try
-                {
-                    instance = Activator.CreateInstance(implType);
-                    s_implementationInstances.TryAdd(instance, false);
-                }
-                catch (Exception ex)
-                {
-                    throw new PlatformImplementationCreationException(implType, ex);
-                }
-            }
-            else
-            {
-                instance = result.Key;
-            }
-
-            return instance;
+            return s_implementationInstances.GetOrAdd(implType, t => Activator.CreateInstance(t));
         }
 
         private static void RegisterImplementationImpl(Platform platform, Type ifaceType, object implementation)