Revert "Change refcount logic in ImportHook.Shutdown"

BadSingleton · BadSingleton · commit d9b21a50bed9 · 2020-09-02T15:30:13.000-04:00
This reverts commit 82034dc.
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -108,25 +108,24 @@ internal static void Shutdown()
             }
 
             RestoreImport();
+
             bool shouldFreeDef = Runtime.Refcount(py_clr_module) == 1;
-#if !NETSTANDARD
-            if(Runtime.ShutdownMode != ShutdownMode.Reload)
-#endif
+            Runtime.XDecref(py_clr_module);
+            py_clr_module = IntPtr.Zero;
+            if (shouldFreeDef)
             {
-                Runtime.XDecref(py_clr_module);
-                py_clr_module = IntPtr.Zero;
-                if (shouldFreeDef)
-                {
-                    ReleaseModuleDef();
-                }
-                Runtime.XDecref(root.pyHandle);
+                ReleaseModuleDef();
             }
+
+            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
`@@ -108,25 +108,24 @@ internal static void Shutdown()`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`RestoreImport();`
	`111`	`+`
`111`	`112`	`bool shouldFreeDef = Runtime.Refcount(py_clr_module) == 1;`
`112`		`-#if !NETSTANDARD`
`113`		`- if(Runtime.ShutdownMode != ShutdownMode.Reload)`
`114`		`-#endif`
	`113`	`+ Runtime.XDecref(py_clr_module);`
	`114`	`+ py_clr_module = IntPtr.Zero;`
	`115`	`+ if (shouldFreeDef)`
`115`	`116`	`{`
`116`		`- Runtime.XDecref(py_clr_module);`
`117`		`- py_clr_module = IntPtr.Zero;`
`118`		`- if (shouldFreeDef)`
`119`		`- {`
`120`		`- ReleaseModuleDef();`
`121`		`- }`
`122`		`- Runtime.XDecref(root.pyHandle);`
	`117`	`+ ReleaseModuleDef();`
`123`	`118`	`}`
	`119`	`+`
	`120`	`+ Runtime.XDecref(root.pyHandle);`
`124`	`121`	`root = null;`
`125`	`122`	`CLRModule.Reset();`
`126`	`123`	`}`
`127`	`124`
`128`	`125`	`internal static void SaveRuntimeData(RuntimeDataStorage storage)`
`129`	`126`	`{`
	`127`	`+ Runtime.XIncref(py_clr_module);`
	`128`	`+ Runtime.XIncref(root.pyHandle);`
`130`	`129`	`storage.AddValue("py_clr_module", py_clr_module);`
`131`	`130`	`storage.AddValue("root", root.pyHandle);`
`132`	`131`	`}`