Skip to content

Ensure the FindReferenceTargetsCallback static constructor is called. #121558

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

Merged
merged 4 commits into from
Nov 13, 2025
Merged

Ensure the FindReferenceTargetsCallback static constructor is called. #121558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d3cf8b
Ensure the static constructor is called.
AaronRobinsonMSFT Nov 12, 2025
c997fd6
Apply fixes for additional issues
AaronRobinsonMSFT Nov 12, 2025
1f7add7
Update comment.
AaronRobinsonMSFT Nov 13, 2025
14412c7
Merge branch 'main' into runtime_121538
AaronRobinsonMSFT Nov 13, 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
1 change: 1 addition & 0 deletions ...stem.Private.CoreLib/src/System/Runtime/InteropServices/TrackerObjectManager.NativeAot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ internal static void DetachNonPromotedObjects()
}

// Callback implementation of IFindReferenceTargetsCallback
[EagerStaticClassConstruction]
internal static unsafe class FindReferenceTargetsCallback
{
// Define an on-stack compatible COM instance to avoid allocating
Expand Down
10 changes: 8 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,18 @@ private IntPtr AsUserDefined(in Guid riid)

private void SetFlag(CreateComInterfaceFlagsEx flag)
{
Interlocked.Or(ref Flags, flag);
// Interlocked.Or<T>cannot be used here. It would trigger type checks that can cause
// deadlocks when called during a GC by NativeAOT TrackerObjectManager.
int setMask = (int)flag;
Interlocked.Or(ref Unsafe.As<CreateComInterfaceFlagsEx, int>(ref Flags), setMask);
}

private void ResetFlag(CreateComInterfaceFlagsEx flag)
{
Interlocked.And(ref Flags, ~flag);
// Interlocked.And<T>cannot be used here. It would trigger type checks that can cause
// deadlocks when called during a GC by NativeAOT TrackerObjectManager.
int resetMask = ~(int)flag;
Interlocked.And(ref Unsafe.As<CreateComInterfaceFlagsEx, int>(ref Flags), resetMask);
}

private static uint GetTrackerCount(ulong c)
Expand Down
Loading