GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Attempt to fix a rare crash while debugging scripting unload

Browse Source
This commit is contained in:
Ari Vuollet
2025-04-10 23:55:59 +03:00
parent a9a9057304
commit 0eb7badf91
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Engine/Engine/NativeInterop.Unmanaged.cs
View File

@@ -1017,6 +1017,13 @@ namespace FlaxEngine.Interop
internal static void UnloadScriptingAssemblyLoadContext() internal static void UnloadScriptingAssemblyLoadContext()
{ {
#if FLAX_EDITOR #if FLAX_EDITOR
// Any of the windows might still process events while GC is blocking, the events
// might go through the interop layer and require DelegateHelpers to invoke internal methods.
// This seems to happen quite often with OnLostFocus event from debugger stealing the focus
// after hitting a breakpoint in the middle of scripting ALC being reloaded.
GC.Collect();
GC.WaitForPendingFinalizers();
// Clear all caches which might hold references to assemblies in collectible ALC // Clear all caches which might hold references to assemblies in collectible ALC
cachedDelegatesCollectible.Clear(); cachedDelegatesCollectible.Clear();
foreach (var pair in managedTypesCollectible) foreach (var pair in managedTypesCollectible)
@@ -1048,7 +1055,6 @@ namespace FlaxEngine.Interop
ArrayFactory.createArrayDelegates.Clear(); ArrayFactory.createArrayDelegates.Clear();
FlaxEngine.Json.JsonSerializer.ResetCache(); FlaxEngine.Json.JsonSerializer.ResetCache();
DelegateHelpers.Release();
// Ensure both pools are empty // Ensure both pools are empty
ManagedHandle.ManagedHandlePool.TryCollectWeakHandles(true); ManagedHandle.ManagedHandlePool.TryCollectWeakHandles(true);
@@ -1057,6 +1063,9 @@ namespace FlaxEngine.Interop
GC.Collect(); GC.Collect();
GC.WaitForPendingFinalizers(); GC.WaitForPendingFinalizers();
// Release these as late as possible in case native code tries to call managed side during cleanup
DelegateHelpers.Release();
{ {
// HACK: Workaround for TypeDescriptor holding references to collectible types (https://github.com/dotnet/runtime/issues/30656) // HACK: Workaround for TypeDescriptor holding references to collectible types (https://github.com/dotnet/runtime/issues/30656)