all Dealloc overrides simply duplicate Clear, so just call both from …

…tp_dealloc and don't override Dealloc
pythonnet · lostmsu · May 23, 2021 · May 23, 2021 · May 23, 2021 · May 23, 2021
commit b1dbe5e927cfb5c9e2285e7a2888f4d5cea3457d
diff --git a/src/runtime/constructorbinding.cs b/src/runtime/constructorbinding.cs
@@ -149,12 +149,6 @@ public static IntPtr tp_repr(IntPtr ob)
             return self.repr;
         }
 
-        protected override void Dealloc()
-        {
-            Runtime.Py_CLEAR(ref this.repr);
-            base.Dealloc();
-        }
-
         protected override void Clear()
         {
             Runtime.Py_CLEAR(ref this.repr);
@@ -247,12 +241,6 @@ public static IntPtr tp_repr(IntPtr ob)
             return self.repr;
         }
 
-        protected override void Dealloc()
-        {
-            Runtime.Py_CLEAR(ref this.repr);
-            base.Dealloc();
-        }
-
         protected override void Clear()
         {
             Runtime.Py_CLEAR(ref this.repr);

diff --git a/src/runtime/eventbinding.cs b/src/runtime/eventbinding.cs
@@ -103,12 +103,6 @@ public static IntPtr tp_repr(IntPtr ob)
             return Runtime.PyString_FromString(s);
         }
 
-        protected override void Dealloc()
-        {
-            Runtime.Py_CLEAR(ref this.target);
-            base.Dealloc();
-        }
-
         protected override void Clear()
         {
             Runtime.Py_CLEAR(ref this.target);

diff --git a/src/runtime/eventobject.cs b/src/runtime/eventobject.cs
@@ -198,16 +198,6 @@ public static IntPtr tp_repr(IntPtr ob)
         }
 
 
-        protected override void Dealloc()
-        {
-            if (this.unbound is not null)
-            {
-                Runtime.XDecref(this.unbound.pyHandle);
-                this.unbound = null;
-            }
-            base.Dealloc();
-        }
-
         protected override void Clear()
         {
             if (this.unbound is not null)

diff --git a/src/runtime/extensiontype.cs b/src/runtime/extensiontype.cs
@@ -56,14 +56,22 @@ void SetupGc ()
 
         protected virtual void Dealloc()
         {
-            ClearObjectDict(this.pyHandle);
+            var type = Runtime.PyObject_TYPE(this.ObjectReference);
             Runtime.PyObject_GC_Del(this.pyHandle);
-            // Not necessary for decref of `tpHandle`.
+            // Not necessary for decref of `tpHandle` - it is borrowed
+
             this.FreeGCHandle();
+
+            // we must decref our type: https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_dealloc
+            Runtime.XDecref(type.DangerousGetAddress());
         }
 
         /// <summary>DecRefs and nulls any fields pointing back to Python</summary>
-        protected virtual void Clear() { }
+        protected virtual void Clear()
+        {
+            ClearObjectDict(this.pyHandle);
+            // Not necessary for decref of `tpHandle` - it is borrowed
+        }
 
         /// <summary>
         /// Type __setattr__ implementation.
@@ -96,6 +104,7 @@ public static void tp_dealloc(IntPtr ob)
             // Clean up a Python instance of this extension type. This
             // frees the allocated Python object and decrefs the type.
             var self = (ExtensionType)GetManagedObject(ob);
+            self?.Clear();
             self?.Dealloc();
         }
 

diff --git a/src/runtime/methodbinding.cs b/src/runtime/methodbinding.cs
@@ -229,21 +229,10 @@ public static IntPtr tp_repr(IntPtr ob)
             return Runtime.PyString_FromString($"<{type} method '{name}'>");
         }
 
-        private void ClearMembers()
-        {
-            Runtime.Py_CLEAR(ref target);
-            Runtime.Py_CLEAR(ref targetType);
-        }
-
-        protected override void Dealloc()
-        {
-            this.ClearMembers();
-            base.Dealloc();
-        }
-
         protected override void Clear()
         {
-            this.ClearMembers();
+            Runtime.Py_CLEAR(ref this.target);
+            Runtime.Py_CLEAR(ref this.targetType);
             base.Clear();
         }
 

diff --git a/src/runtime/methodobject.cs b/src/runtime/methodobject.cs
@@ -200,26 +200,15 @@ public static IntPtr tp_repr(IntPtr ob)
             return Runtime.PyString_FromString($"<method '{self.name}'>");
         }
 
-        private void ClearMembers()
+        protected override void Clear()
         {
-            Runtime.Py_CLEAR(ref doc);
-            if (unbound != null)
+            Runtime.Py_CLEAR(ref this.doc);
+            if (this.unbound != null)
             {
-                Runtime.XDecref(unbound.pyHandle);
-                unbound = null;
+                Runtime.XDecref(this.unbound.pyHandle);
+                this.unbound = null;
             }
-        }
 
-        protected override void Dealloc()
-        {
-            this.ClearMembers();
-            ClearObjectDict(this.pyHandle);
-            base.Dealloc();
-        }
-
-        protected override void Clear()
-        {
-            this.ClearMembers();
             ClearObjectDict(this.pyHandle);
             base.Clear();
         }

diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -308,12 +308,6 @@ public static int tp_traverse(IntPtr ob, IntPtr visit, IntPtr arg)
             return 0;
         }
 
-        protected override void Dealloc()
-        {
-            tp_clear(this.pyHandle);
-            base.Dealloc();
-        }
-
         protected override void Clear()
         {
             Runtime.Py_CLEAR(ref this.dict);

diff --git a/src/runtime/overload.cs b/src/runtime/overload.cs
@@ -58,12 +58,6 @@ public static IntPtr tp_repr(IntPtr op)
             return doc;
         }
 
-        protected override void Dealloc()
-        {
-            Runtime.Py_CLEAR(ref this.target);
-            base.Dealloc();
-        }
-
         protected override void Clear()
         {
             Runtime.Py_CLEAR(ref this.target);