Simplify slot initialisation further

filmor · filmor · commit 5278af48daa3 · 2026-05-12T11:04:42.000+02:00
diff --git a/src/runtime/TypeManager.cs b/src/runtime/TypeManager.cs
@@ -24,8 +24,6 @@ internal class TypeManager
         internal static IPythonBaseTypeProvider pythonBaseTypeProvider;
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
-
-        private const BindingFlags tbFlags = BindingFlags.Public | BindingFlags.Static;
         private static readonly Dictionary<MaybeType, PyType> cache = new();
 
         static readonly Dictionary<PyType, SlotsHolder> _slotsHolders = new(PythonReferenceComparer.Instance);
@@ -654,39 +652,32 @@ static void InheritSubstructs(IntPtr type)
         /// </summary>
         internal static void InitializeSlots(PyType type, Type impl, SlotsHolder? slotsHolder = null)
         {
-            // We work from the most-derived class up; make sure to get
-            // the most-derived slot and not to override it with a base
-            // class's slot.
+            // FlattenHierarchy provides inherited public static methods for slot lookup.
             var seen = new HashSet<string>();
+            MethodInfo[] methods = impl.GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
 
-            while (impl != null)
+            foreach (MethodInfo method in methods)
             {
-                MethodInfo[] methods = impl.GetMethods(tbFlags | BindingFlags.DeclaredOnly);
-                foreach (MethodInfo method in methods)
+                string name = method.Name;
+                if (!name.StartsWith("tp_") && !TypeOffset.IsSupportedSlotName(name))
                 {
-                    string name = method.Name;
-                    if (!name.StartsWith("tp_") && !TypeOffset.IsSupportedSlotName(name))
-                    {
-                        Debug.Assert(!name.Contains("_") || name.StartsWith("_") || method.IsSpecialName);
-                        continue;
-                    }
-
-                    if (seen.Contains(name))
-                    {
-                        continue;
-                    }
-
-                    InitializeSlot(type, Interop.GetThunk(method), name, slotsHolder);
+                    Debug.Assert(!name.Contains("_") || name.StartsWith("_") || method.IsSpecialName);
+                    continue;
+                }
 
-                    seen.Add(name);
+                if (seen.Contains(name))
+                {
+                    continue;
                 }
 
-                var initSlot = impl.GetMethod("InitializeSlots", BindingFlags.Static | BindingFlags.Public);
-                initSlot?.Invoke(null, parameters: new object?[] { type, seen, slotsHolder });
+                InitializeSlot(type, Interop.GetThunk(method), name, slotsHolder);
 
-                impl = impl.BaseType;
+                seen.Add(name);
             }
 
+            var initSlot = impl.GetMethod("InitializeSlots", BindingFlags.Static | BindingFlags.Public | BindingFlags.DeclaredOnly);
+            initSlot?.Invoke(null, parameters: new object?[] { type, seen, slotsHolder });
+
             SetRequiredSlots(type, seen);
         }
 
