Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/9.0-staging] Don't wait for finalizers in 'IReferenceTrackerHost::ReleaseDisconnectedReferenceSources' #110558

Merged
merged 4 commits into from
Jan 8, 2025
Merged

[release/9.0-staging] Don't wait for finalizers in 'IReferenceTrackerHost::ReleaseDisconnectedReferenceSources' #110558

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57d8f7d
Do not wait for finalizers on tracker host callbacks
Sergio0694 Dec 9, 2024
4f7e174
Apply suggestions from PR review
Sergio0694 Dec 9, 2024
0198bfc
Remove unnecessary try/catch
Sergio0694 Dec 9, 2024
99e7801
Merge branch 'release/9.0-staging' into backport/pr-110551-to-release…
jkotas Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/coreclr/interop/trackerobjectmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ namespace

STDMETHODIMP HostServices::ReleaseDisconnectedReferenceSources()
{
return InteropLibImports::WaitForRuntimeFinalizerForExternal();
// We'd like to call InteropLibImports::WaitForRuntimeFinalizerForExternal() here, but this could
// lead to deadlock if the finalizer thread is trying to get back to this thread, because we are
// not pumping anymore. Disable this for now. See: https://github.com/dotnet/runtime/issues/109538.
return S_OK;
}

STDMETHODIMP HostServices::NotifyEndOfReferenceTrackingOnThread()
Expand Down
13 changes: 4 additions & 9 deletions ...iveaot/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.NativeAot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,15 +1418,10 @@ internal static unsafe int IReferenceTrackerHost_DisconnectUnusedReferenceSource
[UnmanagedCallersOnly]
internal static unsafe int IReferenceTrackerHost_ReleaseDisconnectedReferenceSources(IntPtr pThis)
{
try
{
GC.WaitForPendingFinalizers();
return HResults.S_OK;
}
catch (Exception e)
{
return Marshal.GetHRForException(e);
}
// We'd like to call GC.WaitForPendingFinalizers() here, but this could lead to deadlock
// if the finalizer thread is trying to get back to this thread, because we are not pumping
// anymore. Disable this for now. See: https://github.com/dotnet/runtime/issues/109538.
return HResults.S_OK;
}

[UnmanagedCallersOnly]
Expand Down
Loading