Rename InternalSetTarget to StopTracking, remove redundant param

src/coreclr/System.Private.CoreLib/src/System/Runtime/DependentHandle.cs

@@ -169,7 +169,7 @@ public void StopTracking()
                 ThrowHelper.ThrowInvalidOperationException();
             }
 
-            InternalSetTarget(handle, null);
+            InternalStopTracking(handle);
         }
 
         /// <summary>
@@ -213,7 +213,7 @@ internal void UnsafeSetDependent(object? dependent)
         /// <remarks>This method mirrors <see cref="StopTracking"/>, but without the allocation check.</remarks>
         internal void UnsafeStopTracking()
         {
-            InternalSetTarget(_handle, null);
+            InternalStopTracking(_handle);
         }
 
         /// <inheritdoc cref="IDisposable.Dispose"/>
@@ -255,10 +255,10 @@ public void Dispose()
         private static extern object? InternalGetTargetAndDependent(IntPtr dependentHandle, out object? dependent);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        private static extern void InternalSetTarget(IntPtr dependentHandle, object? target);
+        private static extern void InternalSetDependent(IntPtr dependentHandle, object? dependent);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        private static extern void InternalSetDependent(IntPtr dependentHandle, object? dependent);
+        private static extern void InternalStopTracking(IntPtr dependentHandle);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern void InternalFree(IntPtr dependentHandle);

src/coreclr/vm/comdependenthandle.cpp

@@ -75,21 +75,18 @@ FCIMPL2(Object*, DependentHandle::InternalGetTargetAndDependent, OBJECTHANDLE ha
 }
 FCIMPLEND
 
-FCIMPL1(VOID, DependentHandle::InternalFree, OBJECTHANDLE handle)
+FCIMPL2(VOID, DependentHandle::InternalSetDependent, OBJECTHANDLE handle, Object *_dependent)
 {
     FCALL_CONTRACT;
 
     _ASSERTE(handle != NULL);
 
-    HELPER_METHOD_FRAME_BEGIN_0();
-
-    DestroyDependentHandle(handle);
-
-    HELPER_METHOD_FRAME_END();
+    IGCHandleManager *mgr = GCHandleUtilities::GetGCHandleManager();
+    mgr->SetDependentHandleSecondary(handle, _dependent);
 }
 FCIMPLEND
 
-FCIMPL2(VOID, DependentHandle::InternalSetTarget, OBJECTHANDLE handle, Object *_target)
+FCIMPL1(VOID, DependentHandle::InternalStopTracking, OBJECTHANDLE handle)
 {
     FCALL_CONTRACT;
 
@@ -99,17 +96,20 @@ FCIMPL2(VOID, DependentHandle::InternalSetTarget, OBJECTHANDLE handle, Object *_
     FCUnique(0x12);
 
     IGCHandleManager *mgr = GCHandleUtilities::GetGCHandleManager();
-    mgr->StoreObjectInHandle(handle, _target);
+    mgr->StoreObjectInHandle(handle, NULL);
 }
 FCIMPLEND
 
-FCIMPL2(VOID, DependentHandle::InternalSetDependent, OBJECTHANDLE handle, Object *_dependent)
+FCIMPL1(VOID, DependentHandle::InternalFree, OBJECTHANDLE handle)
 {
     FCALL_CONTRACT;
 
     _ASSERTE(handle != NULL);
 
-    IGCHandleManager *mgr = GCHandleUtilities::GetGCHandleManager();
-    mgr->SetDependentHandleSecondary(handle, _dependent);
+    HELPER_METHOD_FRAME_BEGIN_0();
+
+    DestroyDependentHandle(handle);
+
+    HELPER_METHOD_FRAME_END();
 }
 FCIMPLEND

src/coreclr/vm/comdependenthandle.h

@@ -44,9 +44,9 @@ class DependentHandle
     static FCDECL1(Object *, InternalGetTarget, OBJECTHANDLE handle);
     static FCDECL1(Object *, InternalGetDependent, OBJECTHANDLE handle);
     static FCDECL2(Object *, InternalGetTargetAndDependent, OBJECTHANDLE handle, Object **outDependent);
-    static FCDECL1(VOID, InternalFree, OBJECTHANDLE handle);
-    static FCDECL2(VOID, InternalSetTarget, OBJECTHANDLE handle, Object *target);
     static FCDECL2(VOID, InternalSetDependent, OBJECTHANDLE handle, Object *dependent);
+    static FCDECL1(VOID, InternalStopTracking, OBJECTHANDLE handle);
+    static FCDECL1(VOID, InternalFree, OBJECTHANDLE handle);
 };
 
 #endif

src/coreclr/vm/ecalllist.h

@@ -65,9 +65,9 @@ FCFuncStart(gDependentHandleFuncs)
     FCFuncElement("InternalGetTarget",             DependentHandle::InternalGetTarget)
     FCFuncElement("InternalGetDependent",          DependentHandle::InternalGetDependent)
     FCFuncElement("InternalGetTargetAndDependent", DependentHandle::InternalGetTargetAndDependent)
-    FCFuncElement("InternalFree",                  DependentHandle::InternalFree)
-    FCFuncElement("InternalSetTarget",             DependentHandle::InternalSetTarget)
     FCFuncElement("InternalSetDependent",          DependentHandle::InternalSetDependent)
+    FCFuncElement("InternalStopTracking",          DependentHandle::InternalStopTracking)
+    FCFuncElement("InternalFree",                  DependentHandle::InternalFree)
 FCFuncEnd()