Commit 6cdd6d7
committed
Move reflected object creation block
Otherwise if you have a Python object that needs to temporarily create a .NET object in its destructor (for instance write log summary to a file), its destructor will fail if it happens to be freed on the second iteration of loop breaking.1 parent c99cdf3 commit 6cdd6d7
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -281,6 +281,7 @@ internal static void Shutdown() | |||
| 281 | 281 | ||
| 282 | 282 | TryCollectingGarbage(MaxCollectRetriesOnShutdown, forceBreakLoops: true, | |
| 283 | 283 | obj: true, derived: false, buffer: false); | |
| 284 | + CLRObject.creationBlocked = true; | ||
| 284 | 285 | ||
| 285 | 286 | NullGCHandles(ExtensionType.loadedExtensions); | |
| 286 | 287 | ClassManager.RemoveClasses(); | |
@@ -357,7 +358,6 @@ static bool TryCollectingGarbage(int runs, bool forceBreakLoops, | |||
| 357 | 358 | { | |
| 358 | 359 | NullGCHandles(CLRObject.reflectedObjects); | |
| 359 | 360 | CLRObject.reflectedObjects.Clear(); | |
| 360 | - CLRObject.creationBlocked = true; | ||
| 361 | 361 | } | |
| 362 | 362 | } | |
| 363 | 363 | return false; | |
0 commit comments