* Move fields of ManagedDataOffsets into nested type

amos402 · amos402 · commit 8c8d66ec57a5 · 2020-06-24T16:36:03.000+08:00
* Remove assert condition which is `typeSize &lt;= ExceptionOffset.Size()` cause of the type size of `PyHeapTypeObject` derived from clr type may over `ExceptionOffset.Size()`
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -71,6 +71,19 @@ public ModulePropertyAttribute()
 
     internal static partial class TypeOffset
     {
+        static TypeOffset()
+        {
+            Type type = typeof(TypeOffset);
+            FieldInfo[] fields = type.GetFields();
+            int size = IntPtr.Size;
+            for (int i = 0; i < fields.Length; i++)
+            {
+                int offset = i * size;
+                FieldInfo fi = fields[i];
+                fi.SetValue(null, offset);
+            }
+        }
+
         public static int magic() => ManagedDataOffsets.Magic;
     }
 
@@ -79,23 +92,33 @@ 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 class DataOffsets
+        {
+            public static readonly int ob_data;
+            public static readonly int ob_dict;
+
+            static DataOffsets()
+            {
+                FieldInfo[] fields = typeof(DataOffsets).GetFields(BindingFlags.Static | BindingFlags.Public);
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    fields[i].SetValue(null, -(i * IntPtr.Size) - IntPtr.Size);
+                }
+            }
+        }
 
         static ManagedDataOffsets()
         {
             Type type = typeof(TypeOffset);
-            FieldInfo[] fields = type.GetFields();
-            int size = IntPtr.Size;
-            for (int i = 0; i < fields.Length; i++)
+            foreach (FieldInfo fi in type.GetFields())
             {
-                int offset = i * size;
-                FieldInfo fi = fields[i];
-                fi.SetValue(null, offset);
-                NameMapping[fi.Name] = offset;
+                NameMapping[fi.Name] = (int)fi.GetValue(null);
             }
             // XXX: Use the members after PyHeapTypeObject as magic slot
             Magic = TypeOffset.members;
+
+            FieldInfo[] fields = typeof(DataOffsets).GetFields(BindingFlags.Static | BindingFlags.Public);
+            size = fields.Length * IntPtr.Size;
         }
 
         public static int GetSlotOffset(string name)
@@ -107,20 +130,22 @@ 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());
+            Debug.Assert(typeSize > 0);
             return typeSize;
         }
 
         public static int DataOffset(IntPtr type)
         {
-            return BaseOffset(type) + ob_data;
+            return BaseOffset(type) + DataOffsets.ob_data;
         }
 
         public static int DictOffset(IntPtr type)
         {
-            return BaseOffset(type) + ob_dict;
+            return BaseOffset(type) + DataOffsets.ob_dict;
         }
 
+        public static int ob_data => DataOffsets.ob_data;
+        public static int ob_dict => DataOffsets.ob_dict;
         public static int Size { get { return size; } }
 
         private static readonly int size;
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -226,12 +226,14 @@ protected static void ClearObjectDict(IntPtr ob)
 
         protected static IntPtr GetObjectDict(IntPtr ob)
         {
-            return Marshal.ReadIntPtr(ob, ObjectOffset.TypeDictOffset(ob));
+            IntPtr type = Runtime.PyObject_TYPE(ob);
+            return Marshal.ReadIntPtr(ob, ObjectOffset.TypeDictOffset(type));
         }
 
         protected static void SetObjectDict(IntPtr ob, IntPtr value)
         {
-            Marshal.WriteIntPtr(ob, ObjectOffset.TypeDictOffset(ob), value);
+            IntPtr type = Runtime.PyObject_TYPE(ob);
+            Marshal.WriteIntPtr(ob, ObjectOffset.TypeDictOffset(type), value);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -226,12 +226,14 @@ protected static void ClearObjectDict(IntPtr ob)`
`226`	`226`
`227`	`227`	`protected static IntPtr GetObjectDict(IntPtr ob)`
`228`	`228`	`{`
`229`		`- return Marshal.ReadIntPtr(ob, ObjectOffset.TypeDictOffset(ob));`
	`229`	`+ IntPtr type = Runtime.PyObject_TYPE(ob);`
	`230`	`+ return Marshal.ReadIntPtr(ob, ObjectOffset.TypeDictOffset(type));`
`230`	`231`	`}`
`231`	`232`
`232`	`233`	`protected static void SetObjectDict(IntPtr ob, IntPtr value)`
`233`	`234`	`{`
`234`		`- Marshal.WriteIntPtr(ob, ObjectOffset.TypeDictOffset(ob), value);`
	`235`	`+ IntPtr type = Runtime.PyObject_TYPE(ob);`
	`236`	`+ Marshal.WriteIntPtr(ob, ObjectOffset.TypeDictOffset(type), value);`
`235`	`237`	`}`
`236`	`238`	`}`
`237`	`239`	`}`