fixed inability to invoke C# methods from base class when Python base is specified

lostmsu · lostmsu · commit 390a8d48001b · 2019-09-11T14:04:49.000-07:00
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -136,11 +136,16 @@ internal static IntPtr CreateType(ManagedType impl, Type clrType)
                 InitializeSlot(type, TypeOffset.tp_getattro, typeof(SlotOverrides).GetMethod(nameof(SlotOverrides.tp_getattro)));
             }
 
-            IntPtr base_ = GetBaseType(clrType);
+            IntPtr base_ = GetBaseType(clrType, out IntPtr bases);
             if (base_ != IntPtr.Zero)
             {
                 Marshal.WriteIntPtr(type, TypeOffset.tp_base, base_);
                 Runtime.XIncref(base_);
+
+                if (bases != IntPtr.Zero) {
+                    Marshal.WriteIntPtr(type, TypeOffset.tp_bases, bases);
+                    Runtime.XIncref(bases);
+                }
             }
 
             int flags = TypeFlags.Default;
@@ -230,29 +235,45 @@ static string CleanupFullName(string fullTypeName)
             return name;
         }
 
-        static IntPtr GetBaseType(Type clrType)
+        static IntPtr GetBaseType(Type clrType, out IntPtr baseTypes)
         {
+            baseTypes = IntPtr.Zero;
+            if (clrType == typeof(Exception))
+            {
+                return Exceptions.Exception;
+            }
+
+            var bases = new List<IntPtr>();
+
+            // .NET base class must always come first
+            if (clrType.BaseType != null)
+            {
+                ClassBase bc = ClassManager.GetClass(clrType.BaseType);
+                bases.Add(bc.pyHandle);
+            }
+
             var baseOverride = Util.GetLatestAttribute<BaseTypeAttributeBase>(clrType);
             IntPtr handle = baseOverride?.BaseType(clrType) ?? IntPtr.Zero;
             if (handle != IntPtr.Zero) {
                 if ((Util.ReadCLong(handle, TypeOffset.tp_flags) & TypeFlags.BaseType) == 0) {
                     throw new InvalidProgramException("The specified base Python type can not be inherited from");
                 }
 
-                return handle;
+                bases.Add(handle);
             }
 
-            if (clrType == typeof(Exception))
-            {
-                return Exceptions.Exception;
-            }
-            if (clrType.BaseType != null)
-            {
-                ClassBase bc = ClassManager.GetClass(clrType.BaseType);
-                return bc.pyHandle;
+            switch (bases.Count) {
+            case 0:
+                return IntPtr.Zero;
+            case 1:
+                return bases[0];
+            default:
+                baseTypes = Runtime.PyTuple_New(bases.Count);
+                for (int baseIndex = 0; baseIndex < bases.Count; baseIndex++) {
+                    Runtime.PyTuple_SetItem(baseTypes, baseIndex, bases[baseIndex]);
+                }
+                return bases[0];
             }
-
-            return IntPtr.Zero;
         }
 
         internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr py_dict)
