pythonnet
diff --git a/‎src/runtime/extensiontype.cs
Lines changed: 1 addition & 1 deletion b/‎src/runtime/extensiontype.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/runtime/managedtype.cs
Lines changed: 15 additions & 16 deletions b/‎src/runtime/managedtype.cs
Lines changed: 15 additions & 16 deletions
diff --git a/‎src/runtime/runtime.cs
Lines changed: 22 additions & 1 deletion b/‎src/runtime/runtime.cs
Lines changed: 22 additions & 1 deletion
@@ -28,7 +28,7 @@ public ExtensionType()
 
             IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);
 
-            GCHandle gc = AllocGCHandle();
+            GCHandle gc = AllocGCHandle(true);
             Marshal.WriteIntPtr(py, ObjectOffset.magic(tp), (IntPtr)gc);
 
             // We have to support gc because the type machinery makes it very
 
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Linq;
 
 namespace Python.Runtime
 {
@@ -16,9 +17,7 @@ internal abstract class ManagedType
         internal IntPtr pyHandle; // PyObject *
         internal IntPtr tpHandle; // PyType *
 
-#if NPY_TRACK_OBJECT
         private static readonly HashSet<ManagedType> _managedObjs = new HashSet<ManagedType>();
-#endif
 
         internal void DecrRefCount()
         {
@@ -41,22 +40,24 @@ internal long RefCount
             }
         }
 
-        internal GCHandle AllocGCHandle()
+        internal GCHandle AllocGCHandle(bool track = false)
         {
             gcHandle = GCHandle.Alloc(this);
-#if NPY_TRACK_OBJECT
-            _managedObjs.Add(this);
-#endif
+            if (track)
+            {
+                _managedObjs.Add(this);
+            }
             return gcHandle;
         }
 
         internal void FreeGCHandle()
         {
-            gcHandle.Free();
-#if NPY_TRACK_OBJECT
             _managedObjs.Remove(this);
-#endif
-            gcHandle = new GCHandle();
+            if (gcHandle.IsAllocated)
+            {
+                gcHandle.Free();
+                gcHandle = new GCHandle();
+            }
         }
 
         /// <summary>
@@ -120,17 +121,15 @@ internal static bool IsManagedType(IntPtr ob)
             return false;
         }
 
-#if NPY_TRACK_OBJECT
-        internal static void Reset()
+        internal static ICollection<ManagedType> GetManagedObjects()
         {
-            _managedObjs.Clear();
+            return _managedObjs;
         }
 
-        internal static ICollection<ManagedType> GetManagedObjects()
+        internal static void ClearTrackedObjects()
         {
-            return _managedObjs;
+            _managedObjs.Clear();
         }
-#endif
 
         internal static int PyVisit(IntPtr ob, IntPtr visit, IntPtr arg)
         {
 
@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Collections.Generic;
 using Python.Runtime.Platform;
+using System.Linq;
 
 namespace Python.Runtime
 {
@@ -384,13 +385,15 @@ internal static void Shutdown(bool soft)
             Finalizer.Shutdown();
 
             ClearClrModules();
+            RemoveClrRootModule();
+
+            MoveClrInstancesOnwershipToPython();
             ClassManager.RemoveClasses();
             TypeManager.RemoveTypes();
 
             MetaType.Release();
             PyCLRMetaType = IntPtr.Zero;
 
-            RemoveClrRootModule();
             if (soft)
             {
                 PyGC_Collect();
@@ -472,6 +475,24 @@ private static void PyDictTryDelItem(IntPtr dict, string key)
             PyErr_Clear();
         }
 
+        private static void MoveClrInstancesOnwershipToPython()
+        {
+            var copyObjs = ManagedType.GetManagedObjects().ToArray();
+            var objs = ManagedType.GetManagedObjects();
+            foreach (var obj in copyObjs)
+            {
+                if (objs.Contains(obj))
+                {
+                    continue;
+                }
+                obj.TypeClear();
+                PyObject_GC_Track(obj.pyHandle);
+                obj.gcHandle.Free();
+                obj.gcHandle = new GCHandle();
+            }
+            ManagedType.ClearTrackedObjects();
+        }
+
 
         internal static IntPtr Py_single_input = (IntPtr)256;
         internal static IntPtr Py_file_input = (IntPtr)257;
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using System.Runtime.InteropServices;`
	`5`	`+using System.Linq;`
`5`	`6`
`6`	`7`	`namespace Python.Runtime`
`7`	`8`	`{`
`@@ -16,9 +17,7 @@ internal abstract class ManagedType`
`16`	`17`	`internal IntPtr pyHandle; // PyObject *`
`17`	`18`	`internal IntPtr tpHandle; // PyType *`
`18`	`19`
`19`		`-#if NPY_TRACK_OBJECT`
`20`	`20`	`private static readonly HashSet<ManagedType> _managedObjs = new HashSet<ManagedType>();`
`21`		`-#endif`
`22`	`21`
`23`	`22`	`internal void DecrRefCount()`
`24`	`23`	`{`
`@@ -41,22 +40,24 @@ internal long RefCount`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`
`44`		`- internal GCHandle AllocGCHandle()`
	`43`	`+ internal GCHandle AllocGCHandle(bool track = false)`
`45`	`44`	`{`
`46`	`45`	`gcHandle = GCHandle.Alloc(this);`
`47`		`-#if NPY_TRACK_OBJECT`
`48`		`- _managedObjs.Add(this);`
`49`		`-#endif`
	`46`	`+ if (track)`
	`47`	`+ {`
	`48`	`+ _managedObjs.Add(this);`
	`49`	`+ }`
`50`	`50`	`return gcHandle;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`internal void FreeGCHandle()`
`54`	`54`	`{`
`55`		`- gcHandle.Free();`
`56`		`-#if NPY_TRACK_OBJECT`
`57`	`55`	`_managedObjs.Remove(this);`
`58`		`-#endif`
`59`		`- gcHandle = new GCHandle();`
	`56`	`+ if (gcHandle.IsAllocated)`
	`57`	`+ {`
	`58`	`+ gcHandle.Free();`
	`59`	`+ gcHandle = new GCHandle();`
	`60`	`+ }`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`/// <summary>`
`@@ -120,17 +121,15 @@ internal static bool IsManagedType(IntPtr ob)`
`120`	`121`	`return false;`
`121`	`122`	`}`
`122`	`123`
`123`		`-#if NPY_TRACK_OBJECT`
`124`		`- internal static void Reset()`
	`124`	`+ internal static ICollection<ManagedType> GetManagedObjects()`
`125`	`125`	`{`
`126`		`- _managedObjs.Clear();`
	`126`	`+ return _managedObjs;`
`127`	`127`	`}`
`128`	`128`
`129`		`- internal static ICollection<ManagedType> GetManagedObjects()`
	`129`	`+ internal static void ClearTrackedObjects()`
`130`	`130`	`{`
`131`		`- return _managedObjs;`
	`131`	`+ _managedObjs.Clear();`
`132`	`132`	`}`
`133`		`-#endif`
`134`	`133`
`135`	`134`	`internal static int PyVisit(IntPtr ob, IntPtr visit, IntPtr arg)`
`136`	`135`	`{`