remove finalizer assert for raw pointer value; skip collection assert on shutdown when loaded from Python

lostmsu · lostmsu · commit 6383a28b55e2 · 2021-11-22T13:01:24.000-08:00
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -96,8 +96,6 @@ internal PyObject(in StolenReference reference)
         // when the managed wrapper is garbage-collected.
         ~PyObject()
         {
-            Debug.Assert(obj != IntPtr.Zero || this.GetType() != typeof(PyObject));
-
             if (obj != IntPtr.Zero)
             {
 
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -379,14 +379,18 @@ internal static void Shutdown(ShutdownMode mode)
             DisposeLazyModule(inspect);
             PyObjectConversions.Reset();
 
-            bool everythingSeemsCollected = TryCollectingGarbage();
-            Debug.Assert(everythingSeemsCollected);
+            if (mode != ShutdownMode.Extension)
+            {
+                PyGC_Collect();
+                bool everythingSeemsCollected = TryCollectingGarbage();
+                Debug.Assert(everythingSeemsCollected);
+            }
+
             Finalizer.Shutdown();
             InternString.Shutdown();
 
             if (mode != ShutdownMode.Normal && mode != ShutdownMode.Extension)
             {
-                PyGC_Collect();
                 if (mode == ShutdownMode.Soft)
                 {
                     RuntimeState.Restore();

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,6 @@ internal PyObject(in StolenReference reference)`
`96`	`96`	`// when the managed wrapper is garbage-collected.`
`97`	`97`	`~PyObject()`
`98`	`98`	`{`
`99`		`- Debug.Assert(obj != IntPtr.Zero \|\| this.GetType() != typeof(PyObject));`
`100`		`-`
`101`	`99`	`if (obj != IntPtr.Zero)`
`102`	`100`	`{`
`103`	`101`