Free GC handle for all subclass of ExtensionType

amos402 · amos402 · commit 0dee5dad765e · 2019-12-20T21:19:35.000+08:00
diff --git a/src/runtime/constructorbinding.cs b/src/runtime/constructorbinding.cs
@@ -145,7 +145,7 @@ public static IntPtr tp_repr(IntPtr ob)
             var self = (ConstructorBinding)GetManagedObject(ob);
             Runtime.XDecref(self.repr);
             Runtime.XDecref(self.pyTypeHndl);
-            ExtensionType.FinalizeObject(self);
+            self.Dealloc();
         }
 
         public static int tp_traverse(IntPtr ob, IntPtr visit, IntPtr arg)
@@ -242,7 +242,7 @@ public static IntPtr tp_repr(IntPtr ob)
             var self = (BoundContructor)GetManagedObject(ob);
             Runtime.XDecref(self.repr);
             Runtime.XDecref(self.pyTypeHndl);
-            FinalizeObject(self);
+            self.Dealloc();
         }
 
         public static int tp_traverse(IntPtr ob, IntPtr visit, IntPtr arg)
diff --git a/src/runtime/eventbinding.cs b/src/runtime/eventbinding.cs
@@ -118,7 +118,7 @@ public static IntPtr tp_repr(IntPtr ob)
         {
             var self = (EventBinding)GetManagedObject(ob);
             Runtime.XDecref(self.target);
-            ExtensionType.FinalizeObject(self);
+            self.Dealloc();
         }
     }
 }
diff --git a/src/runtime/eventobject.cs b/src/runtime/eventobject.cs
@@ -202,7 +202,7 @@ public static IntPtr tp_repr(IntPtr ob)
             {
                 Runtime.XDecref(self.unbound.pyHandle);
             }
-            FinalizeObject(self);
+            self.Dealloc();
         }
     }
 
diff --git a/src/runtime/extensiontype.cs b/src/runtime/extensiontype.cs
@@ -54,6 +54,11 @@ public static void FinalizeObject(ManagedType self)
             self.gcHandle.Free();
         }
 
+        protected void Dealloc()
+        {
+            FinalizeObject(this);
+            FreeGCHandle();
+        }
 
         /// <summary>
         /// Type __setattr__ implementation.
@@ -88,8 +93,8 @@ 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.
-            ManagedType self = GetManagedObject(ob);
-            FinalizeObject(self);
+            var self = (ExtensionType)GetManagedObject(ob);
+            self.Dealloc();
         }
     }
 }
diff --git a/src/runtime/methodbinding.cs b/src/runtime/methodbinding.cs
@@ -244,7 +244,7 @@ public static IntPtr tp_repr(IntPtr ob)
         {
             var self = (MethodBinding)GetManagedObject(ob);
             self.ClearMembers();
-            FinalizeObject(self);
+            self.Dealloc();
         }
 
         public static int tp_clear(IntPtr ob)
diff --git a/src/runtime/methodobject.cs b/src/runtime/methodobject.cs
@@ -208,7 +208,7 @@ public static IntPtr tp_repr(IntPtr ob)
         {
             var self = (MethodObject)GetManagedObject(ob);
             self.ClearMembers();
-            ExtensionType.FinalizeObject(self);
+            self.Dealloc();
         }
 
         public static int tp_clear(IntPtr ob)
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -305,7 +305,7 @@ public static IntPtr tp_repr(IntPtr ob)
         {
             var self = (ModuleObject)GetManagedObject(ob);
             tp_clear(ob);
-            ExtensionType.tp_dealloc(ob);
+            self.Dealloc();
         }
 
         public static int tp_traverse(IntPtr ob, IntPtr visit, IntPtr arg)
diff --git a/src/runtime/overload.cs b/src/runtime/overload.cs
@@ -65,7 +65,7 @@ public static IntPtr tp_repr(IntPtr op)
         {
             var self = (OverloadMapper)GetManagedObject(ob);
             Runtime.XDecref(self.target);
-            FinalizeObject(self);
+            self.Dealloc();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public static IntPtr tp_repr(IntPtr ob)`
`118`	`118`	`{`
`119`	`119`	`var self = (EventBinding)GetManagedObject(ob);`
`120`	`120`	`Runtime.XDecref(self.target);`
`121`		`- ExtensionType.FinalizeObject(self);`
	`121`	`+ self.Dealloc();`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public static IntPtr tp_repr(IntPtr ob)`
`202`	`202`	`{`
`203`	`203`	`Runtime.XDecref(self.unbound.pyHandle);`
`204`	`204`	`}`
`205`		`- FinalizeObject(self);`
	`205`	`+ self.Dealloc();`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,11 @@ public static void FinalizeObject(ManagedType self)`
`54`	`54`	`self.gcHandle.Free();`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ protected void Dealloc()`
	`58`	`+ {`
	`59`	`+ FinalizeObject(this);`
	`60`	`+ FreeGCHandle();`
	`61`	`+ }`
`57`	`62`
`58`	`63`	`/// <summary>`
`59`	`64`	`/// Type __setattr__ implementation.`
`@@ -88,8 +93,8 @@ public static void tp_dealloc(IntPtr ob)`
`88`	`93`	`{`
`89`	`94`	`// Clean up a Python instance of this extension type. This`
`90`	`95`	`// frees the allocated Python object and decrefs the type.`
`91`		`- ManagedType self = GetManagedObject(ob);`
`92`		`- FinalizeObject(self);`
	`96`	`+ var self = (ExtensionType)GetManagedObject(ob);`
	`97`	`+ self.Dealloc();`
`93`	`98`	`}`
`94`	`99`	`}`
`95`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ public static IntPtr tp_repr(IntPtr ob)`
`244`	`244`	`{`
`245`	`245`	`var self = (MethodBinding)GetManagedObject(ob);`
`246`	`246`	`self.ClearMembers();`
`247`		`- FinalizeObject(self);`
	`247`	`+ self.Dealloc();`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`public static int tp_clear(IntPtr ob)`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public static IntPtr tp_repr(IntPtr ob)`
`208`	`208`	`{`
`209`	`209`	`var self = (MethodObject)GetManagedObject(ob);`
`210`	`210`	`self.ClearMembers();`
`211`		`- ExtensionType.FinalizeObject(self);`
	`211`	`+ self.Dealloc();`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`public static int tp_clear(IntPtr ob)`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ public static IntPtr tp_repr(IntPtr ob)`
`305`	`305`	`{`
`306`	`306`	`var self = (ModuleObject)GetManagedObject(ob);`
`307`	`307`	`tp_clear(ob);`
`308`		`- ExtensionType.tp_dealloc(ob);`
	`308`	`+ self.Dealloc();`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`public static int tp_traverse(IntPtr ob, IntPtr visit, IntPtr arg)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public static IntPtr tp_repr(IntPtr op)`
`65`	`65`	`{`
`66`	`66`	`var self = (OverloadMapper)GetManagedObject(ob);`
`67`	`67`	`Runtime.XDecref(self.target);`
`68`		`- FinalizeObject(self);`
	`68`	`+ self.Dealloc();`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`