Manually merge - ManagedDataOffsets

pythonnet · lostmsu · Oct 8, 2020 · Jun 13, 2019 · Jun 13, 2019 · Jun 13, 2019
commit 498fc8cd89ad13623f56670961474a35deb7c51a
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -5,7 +5,6 @@
 using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Text;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace Python.Runtime
@@ -70,15 +69,20 @@ public ModulePropertyAttribute()
         }
     }
 
-    internal static partial class ManagedDataOffsets
+    internal static partial class TypeOffset
     {
-        static class Helper
-        {
-            public static int magic;
-            public static readonly Dictionary<string, int> NameMapping = new Dictionary<string, int>();
-        }
+        public static int magic() => ManagedDataOffsets.Magic;
+    }
 
-        static TypeOffset()
+    internal static class ManagedDataOffsets
+    {
+        public static int Magic { get; private set; }
+        public static readonly Dictionary<string, int> NameMapping = new Dictionary<string, int>();
+
+        public static readonly int ob_data;
+        public static readonly int ob_dict;
+
+        static ManagedDataOffsets()
         {
             Type type = typeof(TypeOffset);
             FieldInfo[] fields = type.GetFields();
@@ -88,18 +92,30 @@ static TypeOffset()
                 int offset = i * size;
                 FieldInfo fi = fields[i];
                 fi.SetValue(null, offset);
-                Helper.NameMapping[fi.Name] = offset;
+                NameMapping[fi.Name] = offset;
             }
             // XXX: Use the members after PyHeapTypeObject as magic slot
-            Helper.magic = members;
+            Magic = TypeOffset.members;
         }
 
-        public static int magic() => Helper.magic;
-
         public static int GetSlotOffset(string name)
         {
-            return Helper.NameMapping[name];
+            return NameMapping[name];
         }
+
+        private static int BaseOffset(IntPtr type)
+        {
+            Debug.Assert(type != IntPtr.Zero);
+            int typeSize = Marshal.ReadInt32(type, TypeOffset.tp_basicsize);
+            Debug.Assert(typeSize > 0 && typeSize <= ExceptionOffset.Size());
+            return typeSize;
+        }
+
+        public static int DataOffset(IntPtr type)
+        {
+            return BaseOffset(type) + ob_data;
+        }
+
         public static int DictOffset(IntPtr type)
         {
             return BaseOffset(type) + ob_dict;

diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -226,12 +226,12 @@ protected static void ClearObjectDict(IntPtr ob)
 
         protected static IntPtr GetObjectDict(IntPtr ob)
         {
-            return Marshal.ReadIntPtr(ob, ObjectOffset.DictOffset(ob));
+            return Marshal.ReadIntPtr(ob, ObjectOffset.TypeDictOffset(ob));
         }
 
         protected static void SetObjectDict(IntPtr ob, IntPtr value)
         {
-            Marshal.WriteIntPtr(ob, ObjectOffset.DictOffset(ob), value);
+            Marshal.WriteIntPtr(ob, ObjectOffset.TypeDictOffset(ob), value);
         }
     }
 }
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -638,7 +638,7 @@ internal static void InitializeSlots(IntPtr type, Type impl, SlotsHolder slotsHo
                 {
                     continue;
                 }
-                var offset = TypeOffset.GetSlotOffset(slot);
+                var offset = ManagedDataOffsets.GetSlotOffset(slot);
                 Marshal.WriteIntPtr(type, offset, SlotsHolder.GetDefaultSlot(offset));
             }
         }
@@ -656,7 +656,7 @@ internal static void InitializeSlots(IntPtr type, Type impl, SlotsHolder slotsHo
         /// <param name="canOverride">Can override the slot when it existed</param>
         static void InitializeSlot(IntPtr type, IntPtr slot, string name, bool canOverride = true)
         {
-            var offset = TypeOffset.GetSlotOffset(name);
+            var offset = ManagedDataOffsets.GetSlotOffset(name);
             if (!canOverride && Marshal.ReadIntPtr(type, offset) != IntPtr.Zero)
             {
                 return;
@@ -693,7 +693,7 @@ static void InitializeSlot(IntPtr type, int slotOffset, MethodInfo method, Slots
 
         static bool IsSlotSet(IntPtr type, string name)
         {
-            int offset = TypeOffset.GetSlotOffset(name);
+            int offset = ManagedDataOffsets.GetSlotOffset(name);
             return Marshal.ReadIntPtr(type, offset) != IntPtr.Zero;
         }