Explicitly compare MaybeType objects by name

filmor · filmor · commit 4195f1661602 · 2023-10-18T15:14:04.000+02:00
diff --git a/src/runtime/ClassManager.cs b/src/runtime/ClassManager.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Security;
 
 using Python.Runtime.StateSerialization;
@@ -33,7 +32,9 @@ internal class ClassManager
                                                              BindingFlags.Public |
                                                              BindingFlags.NonPublic;
 
-        internal static Dictionary<MaybeType, ReflectedClrType> cache = new(capacity: 128);
+        internal static Dictionary<MaybeType, ReflectedClrType> cache = new(
+            capacity: 128, comparer: new MaybeTypeComparer()
+        );
         private static readonly Type dtype;
 
         private ClassManager()
diff --git a/src/runtime/StateSerialization/MaybeType.cs b/src/runtime/StateSerialization/MaybeType.cs
@@ -3,6 +3,7 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.IO;
+using System.Collections.Generic;
 
 namespace Python.Runtime
 {
@@ -61,4 +62,12 @@ public void GetObjectData(SerializationInfo serializationInfo, StreamingContext
             serializationInfo.AddValue(SerializationName, name);
         }
     }
+
+    internal class MaybeTypeComparer : IEqualityComparer<MaybeType>
+    {
+        public bool Equals (MaybeType lhs, MaybeType rhs) =>
+            lhs.Name == rhs.Name;
+
+        public int GetHashCode(MaybeType t) => t.Name.GetHashCode();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Runtime.Serialization;`
`4`	`4`	`using System.Runtime.Serialization.Formatters.Binary;`
`5`	`5`	`using System.IO;`
	`6`	`+using System.Collections.Generic;`
`6`	`7`
`7`	`8`	`namespace Python.Runtime`
`8`	`9`	`{`
`@@ -61,4 +62,12 @@ public void GetObjectData(SerializationInfo serializationInfo, StreamingContext`
`61`	`62`	`serializationInfo.AddValue(SerializationName, name);`
`62`	`63`	`}`
`63`	`64`	`}`
	`65`	`+`
	`66`	`+ internal class MaybeTypeComparer : IEqualityComparer<MaybeType>`
	`67`	`+ {`
	`68`	`+ public bool Equals (MaybeType lhs, MaybeType rhs) =>`
	`69`	`+ lhs.Name == rhs.Name;`
	`70`	`+`
	`71`	`+ public int GetHashCode(MaybeType t) => t.Name.GetHashCode();`
	`72`	`+ }`
`64`	`73`	`}`