allocate space for GCHandle in instances of CLR Metatype (which are types themselves)

lostmsu · BadSingleton · commit 12d59cab8541 · 2020-12-18T13:31:50.000-05:00
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -150,7 +150,7 @@ internal static IntPtr GetTypeHandle(ManagedType obj, Type type)
         /// </summary>
         internal static IntPtr CreateType(Type impl)
         {
-            IntPtr type = AllocateTypeObject(impl.Name);
+            IntPtr type = AllocateTypeObject(impl.Name, metatype: Runtime.PyTypeType);
             int ob_size = ObjectOffset.Size(type);
 
             // Set tp_basicsize to the size of our managed instance objects.
@@ -223,7 +223,7 @@ internal static IntPtr CreateType(ManagedType impl, Type clrType)
                 base_ = bc.pyHandle;
             }
 
-            IntPtr type = AllocateTypeObject(name);
+            IntPtr type = AllocateTypeObject(name, Runtime.PyCLRMetaType);
 
             Marshal.WriteIntPtr(type, TypeOffset.ob_type, Runtime.PyCLRMetaType);
             Runtime.XIncref(Runtime.PyCLRMetaType);
@@ -438,12 +438,15 @@ internal static IntPtr CreateMetaType(Type impl, out SlotsHolder slotsHolder)
             // the standard type slots, and has to subclass PyType_Type for
             // certain functions in the C runtime to work correctly with it.
 
-            IntPtr type = AllocateTypeObject("CLR Metatype");
-            IntPtr py_type = Runtime.PyTypeType;
+            IntPtr type = AllocateTypeObject("CLR Metatype", metatype: Runtime.PyTypeType);
 
+            IntPtr py_type = Runtime.PyTypeType;
             Marshal.WriteIntPtr(type, TypeOffset.tp_base, py_type);
             Runtime.XIncref(py_type);
 
+            int size = TypeOffset.magic() + IntPtr.Size;
+            Marshal.WriteIntPtr(type, TypeOffset.tp_basicsize, new IntPtr(size));
+
             const int flags = TypeFlags.Default
                             | TypeFlags.Managed
                             | TypeFlags.HeapType
@@ -536,7 +539,7 @@ internal static IntPtr BasicSubType(string name, IntPtr base_, Type impl)
             // Utility to create a subtype of a std Python type, but with
             // a managed type able to override implementation
 
-            IntPtr type = AllocateTypeObject(name);
+            IntPtr type = AllocateTypeObject(name, metatype: Runtime.PyTypeType);
             //Marshal.WriteIntPtr(type, TypeOffset.tp_basicsize, (IntPtr)obSize);
             //Marshal.WriteIntPtr(type, TypeOffset.tp_itemsize, IntPtr.Zero);
 
@@ -582,9 +585,9 @@ internal static IntPtr BasicSubType(string name, IntPtr base_, Type impl)
         /// <summary>
         /// Utility method to allocate a type object &amp; do basic initialization.
         /// </summary>
-        internal static IntPtr AllocateTypeObject(string name)
+        internal static IntPtr AllocateTypeObject(string name, IntPtr metatype)
         {
-            IntPtr type = Runtime.PyType_GenericAlloc(Runtime.PyTypeType, 0);
+            IntPtr type = Runtime.PyType_GenericAlloc(metatype, 0);
             // Clr type would not use __slots__,
             // and the PyMemberDef after PyHeapTypeObject will have other uses(e.g. type handle),
             // thus set the ob_size to 0 for avoiding slots iterations.
