Merge pull request #586 from Popax21/patch-1

Speed up Type.IsSafe()
EverestAPI · Apr 12, 2023 · 725b081 · 725b081
2 parents 61b7b99 + 9ede29d
commit 725b081
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Celeste.Mod.mm/Mod/Everest/Extensions.cs b/Celeste.Mod.mm/Mod/Everest/Extensions.cs
@@ -335,8 +335,15 @@ public static bool IsDown(this TouchLocationState state)
         public static bool IsUp(this TouchLocationState state)
             => state == TouchLocationState.Released || state == TouchLocationState.Invalid;
 
+        [ThreadStatic]
+        private static HashSet<string> _SafeTypes;
         public static bool IsSafe(this Type type) {
+            _SafeTypes ??= new HashSet<string>();
+
             try {
+                if (_SafeTypes.Contains(type.AssemblyQualifiedName))
+                    return true;
+
                 // "Probe" the type
                 _ = type.Name;
                 _ = type.Assembly.FullName;
@@ -348,6 +355,7 @@ public static bool IsSafe(this Type type) {
                 if (!type.BaseType?.IsSafe() ?? false)
                     return false;
 
+                _SafeTypes.Add(type.AssemblyQualifiedName);
                 return true;
             } catch {
                 return false;