when initialized from Python, reset slots implemented in CLR: CLR might shut down and unload corresponding methods before Python terminates

lostmsu · lostmsu · commit e269cf026218 · 2021-11-24T19:17:10.000-08:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -314,7 +314,7 @@ internal static void Shutdown(ShutdownMode mode)
 
             NullGCHandles(ExtensionType.loadedExtensions);
             ClassManager.RemoveClasses();
-            TypeManager.RemoveTypes();
+            TypeManager.RemoveTypes(mode);
 
             MetaType.Release();
             PyCLRMetaType.Dispose();
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -45,20 +45,20 @@ internal static void Initialize()
             pythonBaseTypeProvider = PythonEngine.InteropConfiguration.pythonBaseTypeProviders;
         }
 
-        internal static void RemoveTypes()
+        internal static void RemoveTypes(ShutdownMode shutdownMode)
         {
             foreach (var type in cache.Values)
             {
-                //SlotsHolder holder;
-                //if (_slotsHolders.TryGetValue(type, out holder))
-                //{
-                //    // If refcount > 1, it needs to reset the managed slot,
-                //    // otherwise it can dealloc without any trick.
-                //    if (Runtime.Refcount(type) > 1)
-                //    {
-                //        holder.ResetSlots();
-                //    }
-                //}
+                if (shutdownMode == ShutdownMode.Extension
+                    && _slotsHolders.TryGetValue(type, out var holder))
+                {
+                    // If refcount > 1, it needs to reset the managed slot,
+                    // otherwise it can dealloc without any trick.
+                    if (Runtime.Refcount(type) > 1)
+                    {
+                        holder.ResetSlots();
+                    }
+                }
                 type.Dispose();
             }
             cache.Clear();
