Skip to content

Create an on-stack instance of FindReferenceTargetsCallback. #116081

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 2 commits into from
May 29, 2025
Merged

Create an on-stack instance of FindReferenceTargetsCallback. #116081

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33270c1
Create an on-stack instance of FindReferenceTargetsCallback.
AaronRobinsonMSFT May 28, 2025
b8269a6
Merge branch 'main' into create_onstack_callback
AaronRobinsonMSFT May 29, 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
25 changes: 17 additions & 8 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 @@ -12,9 +12,6 @@ namespace System.Runtime.InteropServices
{
internal static partial class TrackerObjectManager
{
[FixedAddressValueType]
internal static readonly unsafe IntPtr s_findReferencesTargetCallback = (IntPtr)Unsafe.AsPointer(in FindReferenceTargetsCallback.Vftbl);

internal static volatile IntPtr s_trackerManager;
internal static volatile bool s_hasTrackingStarted;
internal static volatile bool s_isGlobalPeggingOn = true;
Expand Down Expand Up @@ -163,9 +160,8 @@ internal static unsafe void WalkExternalTrackerObjects()
if (nativeObjectWrapper != null &&
nativeObjectWrapper.TrackerObject != IntPtr.Zero)
{
FindReferenceTargetsCallback.s_currentRootObjectHandle = nativeObjectWrapper.ProxyHandle;
int hr = IReferenceTracker.FindTrackerTargets(nativeObjectWrapper.TrackerObject, (IntPtr)Unsafe.AsPointer(in s_findReferencesTargetCallback));
FindReferenceTargetsCallback.s_currentRootObjectHandle = default;
FindReferenceTargetsCallback.Instance callback = new(nativeObjectWrapper.ProxyHandle);
int hr = IReferenceTracker.FindTrackerTargets(nativeObjectWrapper.TrackerObject, (IntPtr)(void*)&callback);
if (hr < 0)
{
walkFailed = true;
Expand Down Expand Up @@ -202,7 +198,20 @@ internal static void DetachNonPromotedObjects()
// Callback implementation of IFindReferenceTargetsCallback
internal static unsafe class FindReferenceTargetsCallback
{
internal static GCHandle s_currentRootObjectHandle;
// Define an on-stack compatible COM instance to avoid allocating
// a temporary instance.
[StructLayout(LayoutKind.Sequential)]
internal ref struct Instance
{
private readonly IntPtr _vtable; // First field is IUnknown based vtable.
public GCHandle RootObject;

public Instance(GCHandle handle)
{
_vtable = (IntPtr)Unsafe.AsPointer(in FindReferenceTargetsCallback.Vftbl);
RootObject = handle;
}
}

#pragma warning disable CS3016
[UnmanagedCallersOnly(CallConvs = [typeof(CallConvMemberFunction)])]
Expand Down Expand Up @@ -230,7 +239,7 @@ private static unsafe int IFindReferenceTargetsCallback_FoundTrackerTarget(IntPt
return HResults.E_POINTER;
}

object sourceObject = s_currentRootObjectHandle.Target!;
object sourceObject = ((FindReferenceTargetsCallback.Instance*)pThis)->RootObject.Target!;

if (!TryGetObject(referenceTrackerTarget, out object? targetObject))
{
Expand Down
Loading