Clear tp_dict of ModuleObject

amos402 · amos402 · commit 49d98e85f4ae · 2020-01-18T13:35:39.000+08:00
diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -300,7 +300,6 @@ public static int tp_clear(IntPtr ob)
                 ClearObjectDict(ob);
             }
             self.tpHandle = IntPtr.Zero;
-            Runtime.Py_CLEAR(ref self.tpHandle);
             return 0;
         }
     }
diff --git a/src/runtime/constructorbinding.cs b/src/runtime/constructorbinding.cs
@@ -29,8 +29,7 @@ internal class ConstructorBinding : ExtensionType
         public ConstructorBinding(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder)
         {
             this.type = type;
-            Runtime.XIncref(pyTypeHndl);
-            this.pyTypeHndl = pyTypeHndl;
+            this.pyTypeHndl = pyTypeHndl; // steal a type reference
             this.ctorBinder = ctorBinder;
             repr = IntPtr.Zero;
         }
@@ -144,7 +143,6 @@ public static IntPtr tp_repr(IntPtr ob)
         {
             var self = (ConstructorBinding)GetManagedObject(ob);
             Runtime.XDecref(self.repr);
-            Runtime.XDecref(self.pyTypeHndl);
             self.Dealloc();
         }
 
@@ -179,8 +177,7 @@ internal class BoundContructor : ExtensionType
         public BoundContructor(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder, ConstructorInfo ci)
         {
             this.type = type;
-            Runtime.XIncref(pyTypeHndl);
-            this.pyTypeHndl = pyTypeHndl;
+            this.pyTypeHndl = pyTypeHndl; // steal a type reference
             this.ctorBinder = ctorBinder;
             ctorInfo = ci;
             repr = IntPtr.Zero;
@@ -241,7 +238,6 @@ public static IntPtr tp_repr(IntPtr ob)
         {
             var self = (BoundContructor)GetManagedObject(ob);
             Runtime.XDecref(self.repr);
-            Runtime.XDecref(self.pyTypeHndl);
             self.Dealloc();
         }
 
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -515,17 +515,6 @@ internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)
     }
 
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    internal struct Thunk
-    {
-        public Delegate fn;
-
-        public Thunk(Delegate d)
-        {
-            fn = d;
-        }
-    }
-
     internal class ThunkInfo
     {
         public readonly Delegate Target;
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -53,6 +53,7 @@ public ModuleObject(string name)
             Runtime.XDecref(pyfilename);
             Runtime.XDecref(pydocstring);
 
+            Runtime.XIncref(dict);
             Marshal.WriteIntPtr(pyHandle, ObjectOffset.DictOffset(pyHandle), dict);
 
             InitializeModuleMembers();
@@ -328,8 +329,8 @@ public static int tp_traverse(IntPtr ob, IntPtr visit, IntPtr arg)
         public static int tp_clear(IntPtr ob)
         {
             var self = (ModuleObject)GetManagedObject(ob);
-            Runtime.XDecref(self.dict);
-            self.dict = IntPtr.Zero;
+            Runtime.Py_CLEAR(ref self.dict);
+            ClearObjectDict(ob);
             foreach (var attr in self.cache.Values)
             {
                 Runtime.XDecref(attr.pyHandle);
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -1112,9 +1112,6 @@ private void ResetSlots()
             Runtime.XDecref(tp_bases);
             tp_bases = Runtime.PyTuple_New(0);
             Marshal.WriteIntPtr(_type, TypeOffset.tp_bases, tp_bases);
-
-            // FIXME: release dict;
-            Marshal.WriteIntPtr(_type, TypeOffset.tp_dictoffset, IntPtr.Zero);
         }
 
         private static void OnDestruct(IntPtr ob)

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,6 @@ public static int tp_clear(IntPtr ob)`
`300`	`300`	`ClearObjectDict(ob);`
`301`	`301`	`}`
`302`	`302`	`self.tpHandle = IntPtr.Zero;`
`303`		`- Runtime.Py_CLEAR(ref self.tpHandle);`
`304`	`303`	`return 0;`
`305`	`304`	`}`
`306`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ internal class ConstructorBinding : ExtensionType`
`29`	`29`	`public ConstructorBinding(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder)`
`30`	`30`	`{`
`31`	`31`	`this.type = type;`
`32`		`- Runtime.XIncref(pyTypeHndl);`
`33`		`- this.pyTypeHndl = pyTypeHndl;`
	`32`	`+ this.pyTypeHndl = pyTypeHndl; // steal a type reference`
`34`	`33`	`this.ctorBinder = ctorBinder;`
`35`	`34`	`repr = IntPtr.Zero;`
`36`	`35`	`}`
`@@ -144,7 +143,6 @@ public static IntPtr tp_repr(IntPtr ob)`
`144`	`143`	`{`
`145`	`144`	`var self = (ConstructorBinding)GetManagedObject(ob);`
`146`	`145`	`Runtime.XDecref(self.repr);`
`147`		`- Runtime.XDecref(self.pyTypeHndl);`
`148`	`146`	`self.Dealloc();`
`149`	`147`	`}`
`150`	`148`
`@@ -179,8 +177,7 @@ internal class BoundContructor : ExtensionType`
`179`	`177`	`public BoundContructor(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder, ConstructorInfo ci)`
`180`	`178`	`{`
`181`	`179`	`this.type = type;`
`182`		`- Runtime.XIncref(pyTypeHndl);`
`183`		`- this.pyTypeHndl = pyTypeHndl;`
	`180`	`+ this.pyTypeHndl = pyTypeHndl; // steal a type reference`
`184`	`181`	`this.ctorBinder = ctorBinder;`
`185`	`182`	`ctorInfo = ci;`
`186`	`183`	`repr = IntPtr.Zero;`
`@@ -241,7 +238,6 @@ public static IntPtr tp_repr(IntPtr ob)`
`241`	`238`	`{`
`242`	`239`	`var self = (BoundContructor)GetManagedObject(ob);`
`243`	`240`	`Runtime.XDecref(self.repr);`
`244`		`- Runtime.XDecref(self.pyTypeHndl);`
`245`	`241`	`self.Dealloc();`
`246`	`242`	`}`
`247`	`243`
Original file line number	Diff line number	Diff line change
`@@ -1112,9 +1112,6 @@ private void ResetSlots()`
`1112`	`1112`	`Runtime.XDecref(tp_bases);`
`1113`	`1113`	`tp_bases = Runtime.PyTuple_New(0);`
`1114`	`1114`	`Marshal.WriteIntPtr(_type, TypeOffset.tp_bases, tp_bases);`
`1115`		`-`
`1116`		`- // FIXME: release dict;`
`1117`		`- Marshal.WriteIntPtr(_type, TypeOffset.tp_dictoffset, IntPtr.Zero);`
`1118`	`1115`	`}`
`1119`	`1116`
`1120`	`1117`	`private static void OnDestruct(IntPtr ob)`