Fix implementation of IFindReferenceTargetsCallback::FoundTrackerTarget

src/coreclr/debug/daccess/request.cpp

@@ -4440,7 +4440,7 @@ HRESULT ClrDataAccess::DACTryGetComWrappersObjectFromCCW(CLRDATA_ADDRESS ccwPtr,
 
     holder = (MOWHOLDERREF)ObjectFromHandle(handle);
 
-    *objRef = holder->_wrappedObject;
+    *objRef = holder->WrappedObject;
 
     return S_OK;
 

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TrackerObjectManager.NativeAot.cs

@@ -230,13 +230,20 @@ private static unsafe int IFindReferenceTargetsCallback_FoundTrackerTarget(IntPt
                 return HResults.E_INVALIDARG;
             }
 
-            if (TryGetObject(referenceTrackerTarget, out object? foundObject))
+            if (!TryGetObject(referenceTrackerTarget, out object? targetObject))
             {
-                // Notify the runtime a reference path was found.
-                return TrackerObjectManager.AddReferencePath(s_currentRootObjectHandle.Target, foundObject) ? HResults.S_OK : HResults.S_FALSE;
+                return HResults.S_FALSE;
             }
 
-            return HResults.S_OK;
+            object sourceObject = s_currentRootObjectHandle.Target!;
+
+            if (sourceObject == targetObject)
+            {
+                return HResults.S_FALSE;
+            }
+
+            // Notify the runtime a reference path was found.
+            return TrackerObjectManager.AddReferencePath(sourceObject, targetObject) ? HResults.S_OK : HResults.S_FALSE;
         }
 
         internal struct ReferenceTargetsVftbl

src/coreclr/vm/corelib.h

@@ -462,6 +462,7 @@ DEFINE_FIELD(COMWRAPPERS, NAITVE_OBJECT_WRAPPER_TABLE, s_nativeObjectWrapperTabl
 DEFINE_FIELD(COMWRAPPERS, ALL_MANAGED_OBJECT_WRAPPER_TABLE, s_allManagedObjectWrapperTable)
 
 DEFINE_CLASS_U(Interop, ComWrappers+ManagedObjectWrapperHolder, ManagedObjectWrapperHolderObject)
+DEFINE_FIELD_U(_wrappedObject, ManagedObjectWrapperHolderObject, WrappedObject)
 DEFINE_FIELD_U(_wrapper, ManagedObjectWrapperHolderObject, ManagedObjectWrapper)
 DEFINE_CLASS_U(Interop, ComWrappers+NativeObjectWrapper, NativeObjectWrapperObject)
 DEFINE_FIELD_U(_comWrappers, NativeObjectWrapperObject, _comWrappers)

src/coreclr/vm/interoplibinterface_comwrappers.cpp

@@ -453,16 +453,23 @@ namespace InteropLibImports
         CONTRACTL_END;
 
         // Get the external object's managed wrapper
-        ::OBJECTHANDLE srcHandle = static_cast<::OBJECTHANDLE>(targetHandle);
+        ::OBJECTHANDLE srcHandle = static_cast<::OBJECTHANDLE>(sourceHandle);
         OBJECTREF source = ObjectFromHandle(srcHandle);
 
         // Get the target of the external object's reference.
         ::OBJECTHANDLE tgtHandle = static_cast<::OBJECTHANDLE>(targetHandle);
-        OBJECTREF target = ObjectFromHandle(tgtHandle );
+        MOWHOLDERREF holder = (MOWHOLDERREF)ObjectFromHandle(tgtHandle);
 
-        // Return if the target has been collected or these are the same object.
-        if (target == NULL
-            || source->PassiveGetSyncBlock() == target->PassiveGetSyncBlock())
+        // Return if the holder has been collected
+        if (holder == NULL)
+        {
+            return S_FALSE;
+        }
+
+        OBJECTREF target = holder->WrappedObject;
+
+        // Return if these are the same object.
+        if (source == target)
         {
             return S_FALSE;
         }

src/coreclr/vm/interoplibinterface_comwrappers.h

@@ -73,8 +73,8 @@ class ManagedObjectWrapperHolderObject : public Object
     friend class ClrDataAccess;
 private:
     OBJECTREF _releaser;
-    OBJECTREF _wrappedObject;
 public:
+    OBJECTREF WrappedObject;
     DPTR(InteropLib::ABI::ManagedObjectWrapperLayout) ManagedObjectWrapper;
 };