can't really clear managed references to Python objects from ManagedType instances, unless they are per-alloc call

lostmsu · lostmsu · commit a610aa3d334a · 2021-10-29T19:46:28.000-07:00
no problem though - they will be collected by .NET garbage collector eventually
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -99,8 +99,6 @@ internal static ClassManagerState SaveRuntimeData()
                 using var dict = Runtime.PyObject_GenericGetDict(cls.Value);
                 foreach (var member in cb.dotNetMembers)
                 {
-                    // No need to decref the member, the ClassBase instance does 
-                    // not own the reference.
                     if ((Runtime.PyDict_DelItemString(dict.Borrow(), member) == -1) &&
                         (Exceptions.ExceptionMatches(Exceptions.KeyError)))
                     {
diff --git a/src/runtime/eventbinding.cs b/src/runtime/eventbinding.cs
@@ -94,11 +94,5 @@ public static NewReference tp_repr(BorrowedReference ob)
             string s = string.Format("<{0} event '{1}'>", type, self.e.name);
             return Runtime.PyString_FromString(s);
         }
-
-        protected override void Clear(BorrowedReference ob)
-        {
-            Runtime.Py_CLEAR(ref this.target);
-            base.Clear(ob);
-        }
     }
 }
diff --git a/src/runtime/methodbinding.cs b/src/runtime/methodbinding.cs
@@ -277,12 +277,5 @@ public static NewReference tp_repr(BorrowedReference ob)
             string name = self.m.name;
             return Runtime.PyString_FromString($"<{type} method '{name}'>");
         }
-
-        protected override void Clear(BorrowedReference ob)
-        {
-            this.target = null;
-            this.targetType = null!;
-            base.Clear(ob);
-        }
     }
 }
diff --git a/src/runtime/methodobject.cs b/src/runtime/methodobject.cs
@@ -204,7 +204,6 @@ public static NewReference tp_repr(BorrowedReference ob)
 
         protected override void Clear(BorrowedReference ob)
         {
-            Runtime.Py_CLEAR(ref this.doc);
             this.unbound = null;
             base.Clear(ob);
         }
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -331,12 +331,6 @@ public static int tp_traverse(BorrowedReference ob, IntPtr visit, IntPtr arg)
             return 0;
         }
 
-        protected override void Clear(BorrowedReference ob)
-        {
-            this.cache.Clear();
-            base.Clear(ob);
-        }
-
         /// <summary>
         /// Override the setattr implementation.
         /// This is needed because the import mechanics need
diff --git a/src/runtime/overload.cs b/src/runtime/overload.cs
@@ -54,12 +54,5 @@ public static NewReference tp_repr(BorrowedReference op)
             var self = (OverloadMapper)GetManagedObject(op)!;
             return self.m.GetDocString();
         }
-
-        protected override void Clear(BorrowedReference ob)
-        {
-            this.target = null;
-            this.m = null!;
-            base.Clear(ob);
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,6 @@ internal static ClassManagerState SaveRuntimeData()`
`99`	`99`	`using var dict = Runtime.PyObject_GenericGetDict(cls.Value);`
`100`	`100`	`foreach (var member in cb.dotNetMembers)`
`101`	`101`	`{`
`102`		`- // No need to decref the member, the ClassBase instance does`
`103`		`- // not own the reference.`
`104`	`102`	`if ((Runtime.PyDict_DelItemString(dict.Borrow(), member) == -1) &&`
`105`	`103`	`(Exceptions.ExceptionMatches(Exceptions.KeyError)))`
`106`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -94,11 +94,5 @@ public static NewReference tp_repr(BorrowedReference ob)`
`94`	`94`	`string s = string.Format("<{0} event '{1}'>", type, self.e.name);`
`95`	`95`	`return Runtime.PyString_FromString(s);`
`96`	`96`	`}`
`97`		`-`
`98`		`- protected override void Clear(BorrowedReference ob)`
`99`		`- {`
`100`		`- Runtime.Py_CLEAR(ref this.target);`
`101`		`- base.Clear(ob);`
`102`		`- }`
`103`	`97`	`}`
`104`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -277,12 +277,5 @@ public static NewReference tp_repr(BorrowedReference ob)`
`277`	`277`	`string name = self.m.name;`
`278`	`278`	`return Runtime.PyString_FromString($"<{type} method '{name}'>");`
`279`	`279`	`}`
`280`		`-`
`281`		`- protected override void Clear(BorrowedReference ob)`
`282`		`- {`
`283`		`- this.target = null;`
`284`		`- this.targetType = null!;`
`285`		`- base.Clear(ob);`
`286`		`- }`
`287`	`280`	`}`
`288`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,6 @@ public static NewReference tp_repr(BorrowedReference ob)`
`204`	`204`
`205`	`205`	`protected override void Clear(BorrowedReference ob)`
`206`	`206`	`{`
`207`		`- Runtime.Py_CLEAR(ref this.doc);`
`208`	`207`	`this.unbound = null;`
`209`	`208`	`base.Clear(ob);`
`210`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,5 @@ public static NewReference tp_repr(BorrowedReference op)`
`54`	`54`	`var self = (OverloadMapper)GetManagedObject(op)!;`
`55`	`55`	`return self.m.GetDocString();`
`56`	`56`	`}`
`57`		`-`
`58`		`- protected override void Clear(BorrowedReference ob)`
`59`		`- {`
`60`		`- this.target = null;`
`61`		`- this.m = null!;`
`62`		`- base.Clear(ob);`
`63`		`- }`
`64`	`57`	`}`
`65`	`58`	`}`