Change refcount logic in ImportHook.Shutdown

BadSingleton · BadSingleton · commit 82034dcb503b · 2020-08-21T11:28:15.000-04:00
If the shutdown mode is Reload, don't decref. Addresses comment: #958
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -107,24 +107,25 @@ internal static void Shutdown()
             }
 
             RestoreImport();
-
             bool shouldFreeDef = Runtime.Refcount(py_clr_module) == 1;
-            Runtime.XDecref(py_clr_module);
-            py_clr_module = IntPtr.Zero;
-            if (shouldFreeDef)
+#if !NETSTANDARD
+            if(Runtime.ShutdownMode != ShutdownMode.Reload)
+#endif
             {
-                ReleaseModuleDef();
+                Runtime.XDecref(py_clr_module);
+                py_clr_module = IntPtr.Zero;
+                if (shouldFreeDef)
+                {
+                    ReleaseModuleDef();
+                }
+                Runtime.XDecref(root.pyHandle);
             }
-
-            Runtime.XDecref(root.pyHandle);
             root = null;
             CLRModule.Reset();
         }
 
         internal static void SaveRuntimeData(RuntimeDataStorage storage)
         {
-            Runtime.XIncref(py_clr_module);
-            Runtime.XIncref(root.pyHandle);
             storage.AddValue("py_clr_module", py_clr_module);
             storage.AddValue("root", root.pyHandle);
         }

Original file line number	Diff line number	Diff line change
`@@ -107,24 +107,25 @@ internal static void Shutdown()`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`RestoreImport();`
`110`		`-`
`111`	`110`	`bool shouldFreeDef = Runtime.Refcount(py_clr_module) == 1;`
`112`		`- Runtime.XDecref(py_clr_module);`
`113`		`- py_clr_module = IntPtr.Zero;`
`114`		`- if (shouldFreeDef)`
	`111`	`+#if !NETSTANDARD`
	`112`	`+ if(Runtime.ShutdownMode != ShutdownMode.Reload)`
	`113`	`+#endif`
`115`	`114`	`{`
`116`		`- ReleaseModuleDef();`
	`115`	`+ Runtime.XDecref(py_clr_module);`
	`116`	`+ py_clr_module = IntPtr.Zero;`
	`117`	`+ if (shouldFreeDef)`
	`118`	`+ {`
	`119`	`+ ReleaseModuleDef();`
	`120`	`+ }`
	`121`	`+ Runtime.XDecref(root.pyHandle);`
`117`	`122`	`}`
`118`		`-`
`119`		`- Runtime.XDecref(root.pyHandle);`
`120`	`123`	`root = null;`
`121`	`124`	`CLRModule.Reset();`
`122`	`125`	`}`
`123`	`126`
`124`	`127`	`internal static void SaveRuntimeData(RuntimeDataStorage storage)`
`125`	`128`	`{`
`126`		`- Runtime.XIncref(py_clr_module);`
`127`		`- Runtime.XIncref(root.pyHandle);`
`128`	`129`	`storage.AddValue("py_clr_module", py_clr_module);`
`129`	`130`	`storage.AddValue("root", root.pyHandle);`
`130`	`131`	`}`