Fix geninterop script and regenerate interop39.cs

filmor · filmor · commit f65297ae4f5f · 2021-02-04T22:14:01.000+01:00
diff --git a/src/runtime/interop39.cs b/src/runtime/interop39.cs
@@ -15,8 +15,24 @@ namespace Python.Runtime
 {
 
     [StructLayout(LayoutKind.Sequential)]
-    internal static partial class TypeOffset
+    internal static class TypeOffset
     {
+        static TypeOffset()
+        {
+            Type type = typeof(TypeOffset);
+            FieldInfo[] fi = type.GetFields();
+            int size = IntPtr.Size;
+            for (int i = 0; i < fi.Length; i++)
+            {
+                fi[i].SetValue(null, i * size);
+            }
+        }
+
+        public static int magic()
+        {
+            return ob_size;
+        }
+
         // Auto-generated from PyHeapTypeObject in Python.h
         public static int ob_refcnt = 0;
         public static int ob_type = 0;
@@ -225,3 +241,4 @@ internal static partial class SlotTypes
 
 }
 #endif
+
diff --git a/tools/geninterop/geninterop.py b/tools/geninterop/geninterop.py
@@ -289,8 +289,24 @@ def gen_heap_type_members(parser, writer):
     members = parser.get_struct_members("PyHeapTypeObject")
     class_definition = """
     [StructLayout(LayoutKind.Sequential)]
-    internal static partial class TypeOffset
+    internal static class TypeOffset
     {
+        static TypeOffset()
+        {
+            Type type = typeof(TypeOffset);
+            FieldInfo[] fi = type.GetFields();
+            int size = IntPtr.Size;
+            for (int i = 0; i < fi.Length; i++)
+            {
+                fi[i].SetValue(null, i * size);
+            }
+        }
+
+        public static int magic()
+        {
+            return ob_size;
+        }
+
         // Auto-generated from PyHeapTypeObject in Python.h
 """
 
