Skip to content

Commit e91f40d

Browse files
CopilotMichalStrehovskyjkotas
authored
Remove unused DEFINE_METHOD identifiers, orphaned methods and classes, and unused metasig signatures (#121650)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: MichalStrehovsky <[email protected]> Co-authored-by: jkotas <[email protected]>
1 parent 01e9dbf commit e91f40d

File tree

3 files changed

+0
-65
lines changed

3 files changed

+0
-65
lines changed

‎src/coreclr/System.Private.CoreLib/src/System/StubHelpers.cs‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,24 +1299,6 @@ public static void AddToCleanupList(ref CleanupWorkListElement? list, CleanupWor
12991299
}
13001300
}
13011301

1302-
// Keeps an object instance alive across the full Managed->Native call.
1303-
// This ensures that users don't have to call GC.KeepAlive after passing a struct or class
1304-
// that has a delegate field to native code.
1305-
internal sealed class KeepAliveCleanupWorkListElement : CleanupWorkListElement
1306-
{
1307-
public KeepAliveCleanupWorkListElement(object obj)
1308-
{
1309-
m_obj = obj;
1310-
}
1311-
1312-
private readonly object m_obj;
1313-
1314-
protected override void DestroyCore()
1315-
{
1316-
GC.KeepAlive(m_obj);
1317-
}
1318-
}
1319-
13201302
// Aggregates SafeHandle and the "owned" bit which indicates whether the SafeHandle
13211303
// has been successfully AddRef'ed. This allows us to do realiable cleanup (Release)
13221304
// if and only if it is needed.
@@ -1367,12 +1349,6 @@ internal static IntPtr AddToCleanupList(ref CleanupWorkListElement? pCleanupWork
13671349
return element.AddRef();
13681350
}
13691351

1370-
internal static void KeepAliveViaCleanupList(ref CleanupWorkListElement? pCleanupWorkList, object obj)
1371-
{
1372-
KeepAliveCleanupWorkListElement element = new KeepAliveCleanupWorkListElement(obj);
1373-
CleanupWorkListElement.AddToCleanupList(ref pCleanupWorkList, element);
1374-
}
1375-
13761352
internal static void DestroyCleanupList(ref CleanupWorkListElement? pCleanupWorkList)
13771353
{
13781354
if (pCleanupWorkList != null)
@@ -1564,21 +1540,6 @@ internal static unsafe void FmtClassUpdateCLRInternal(object obj, byte* pNative)
15641540
}
15651541
}
15661542

1567-
internal static unsafe void LayoutDestroyNativeInternal(object obj, byte* pNative)
1568-
{
1569-
MethodTable* pMT = RuntimeHelpers.GetMethodTable(obj);
1570-
1571-
delegate*<ref byte, byte*, int, ref CleanupWorkListElement?, void> structMarshalStub;
1572-
nuint size;
1573-
bool success = Marshal.TryGetStructMarshalStub((IntPtr)pMT, &structMarshalStub, &size);
1574-
Debug.Assert(success);
1575-
1576-
if (structMarshalStub != null)
1577-
{
1578-
structMarshalStub(ref obj.GetRawData(), pNative, MarshalOperation.Cleanup, ref Unsafe.NullRef<CleanupWorkListElement?>());
1579-
}
1580-
}
1581-
15821543
[LibraryImport(RuntimeHelpers.QCall, EntryPoint="StubHelpers_MarshalToManagedVaList")]
15831544
internal static partial void MarshalToManagedVaList(IntPtr va_list, IntPtr pArgIterator);
15841545

‎src/coreclr/vm/corelib.h‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ DEFINE_METHOD(CLASS, GET_PROPERTIES, GetProperties,
154154
DEFINE_METHOD(CLASS, GET_FIELDS, GetFields, IM_BindingFlags_RetArrFieldInfo)
155155
DEFINE_METHOD(CLASS, GET_METHODS, GetMethods, IM_BindingFlags_RetArrMethodInfo)
156156
DEFINE_METHOD(CLASS, INVOKE_MEMBER, InvokeMember, IM_Str_BindingFlags_Binder_Obj_ArrObj_ArrParameterModifier_CultureInfo_ArrStr_RetObj)
157-
DEFINE_METHOD(CLASS, GET_METHOD_BASE, GetMethodBase, SM_RuntimeType_RuntimeMethodHandleInternal_RetMethodBase)
158-
DEFINE_METHOD(CLASS, GET_FIELD_INFO, GetFieldInfo, SM_RuntimeType_IRuntimeFieldInfo_RetFieldInfo)
159157
#ifdef FOR_ILLINK
160158
DEFINE_METHOD(CLASS, CTOR, .ctor, IM_RetVoid)
161159
#endif // FOR_ILLINK
@@ -196,10 +194,6 @@ END_ILLINK_FEATURE_SWITCH()
196194

197195
DEFINE_CLASS(CRITICAL_HANDLE, Interop, CriticalHandle)
198196
DEFINE_FIELD(CRITICAL_HANDLE, HANDLE, handle)
199-
DEFINE_METHOD(CRITICAL_HANDLE, RELEASE_HANDLE, ReleaseHandle, IM_RetBool)
200-
DEFINE_METHOD(CRITICAL_HANDLE, GET_IS_INVALID, get_IsInvalid, IM_RetBool)
201-
DEFINE_METHOD(CRITICAL_HANDLE, DISPOSE, Dispose, IM_RetVoid)
202-
DEFINE_METHOD(CRITICAL_HANDLE, DISPOSE_BOOL, Dispose, IM_Bool_RetVoid)
203197

204198
DEFINE_CLASS(HANDLE_REF, Interop, HandleRef)
205199
DEFINE_FIELD(HANDLE_REF, WRAPPER, _wrapper)
@@ -358,7 +352,6 @@ DEFINE_METHOD(VALUETASK, THROW_IF_COMPLETED_UNSUCCESSFULLY, ThrowIfCompletedUnsu
358352
DEFINE_METHOD(VALUETASK, AS_TASK_OR_NOTIFIER, AsTaskOrNotifier, IM_RetObj)
359353

360354
DEFINE_CLASS(TASK_1, Tasks, Task`1)
361-
DEFINE_METHOD(TASK_1, GET_RESULTONSUCCESS, get_ResultOnSuccess, NoSig)
362355

363356
DEFINE_CLASS(TASK, Tasks, Task)
364357
DEFINE_METHOD(TASK, FROM_EXCEPTION, FromException, SM_Exception_RetTask)
@@ -369,7 +362,6 @@ DEFINE_METHOD(TASK, GET_ISCOMPLETED, get_IsCompleted, NoSig)
369362

370363
DEFINE_CLASS(TYPE_HANDLE, System, RuntimeTypeHandle)
371364
DEFINE_CLASS(RT_TYPE_HANDLE, System, RuntimeTypeHandle)
372-
DEFINE_METHOD(RT_TYPE_HANDLE, PVOID_CTOR, .ctor, IM_RuntimeType_RetVoid)
373365
DEFINE_METHOD(RT_TYPE_HANDLE, GETRUNTIMETYPEFROMHANDLE,GetRuntimeTypeFromHandle, SM_IntPtr_RetRuntimeType)
374366
DEFINE_METHOD(RT_TYPE_HANDLE, GETRUNTIMETYPEFROMHANDLEMAYBENULL,GetRuntimeTypeFromHandleMaybeNull, SM_IntPtr_RetRuntimeType)
375367
DEFINE_METHOD(RT_TYPE_HANDLE, TO_INTPTR, ToIntPtr, SM_RuntimeTypeHandle_RetIntPtr)
@@ -719,7 +711,6 @@ DEFINE_METHOD(RUNTIME_HELPERS, GET_UNINITIALIZED_OBJECT, GetUninitializedOb
719711
DEFINE_METHOD(RUNTIME_HELPERS, ENUM_EQUALS, EnumEquals, NoSig)
720712
DEFINE_METHOD(RUNTIME_HELPERS, ENUM_COMPARE_TO, EnumCompareTo, NoSig)
721713
DEFINE_METHOD(RUNTIME_HELPERS, ALLOC_TAILCALL_ARG_BUFFER, AllocTailCallArgBuffer, NoSig)
722-
DEFINE_METHOD(RUNTIME_HELPERS, GET_TAILCALL_INFO, GetTailCallInfo, NoSig)
723714
DEFINE_METHOD(RUNTIME_HELPERS, DISPATCH_TAILCALLS, DispatchTailCalls, NoSig)
724715
#ifdef FEATURE_IJW
725716
DEFINE_METHOD(RUNTIME_HELPERS, COPY_CONSTRUCT, CopyConstruct, NoSig)
@@ -740,7 +731,6 @@ DEFINE_METHOD(ASYNC_HELPERS, TASK_FROM_EXCEPTION_1, TaskFromException, GM_E
740731
DEFINE_METHOD(ASYNC_HELPERS, VALUETASK_FROM_EXCEPTION, ValueTaskFromException, SM_Exception_RetValueTask)
741732
DEFINE_METHOD(ASYNC_HELPERS, VALUETASK_FROM_EXCEPTION_1, ValueTaskFromException, GM_Exception_RetValueTaskOfT)
742733

743-
DEFINE_METHOD(ASYNC_HELPERS, UNSAFE_AWAIT_AWAITER_1, UnsafeAwaitAwaiter, GM_T_RetVoid)
744734
DEFINE_METHOD(ASYNC_HELPERS, TRANSPARENT_AWAIT, TransparentAwait, NoSig)
745735
DEFINE_METHOD(ASYNC_HELPERS, COMPLETED_TASK_RESULT, CompletedTaskResult, NoSig)
746736
DEFINE_METHOD(ASYNC_HELPERS, COMPLETED_TASK, CompletedTask, NoSig)
@@ -754,12 +744,6 @@ DEFINE_METHOD(ASYNC_HELPERS, ASYNC_CALL_CONTINUATION, AsyncCallContinuati
754744
#ifdef TARGET_BROWSER
755745
DEFINE_METHOD(ASYNC_HELPERS, HANDLE_ASYNC_ENTRYPOINT, HandleAsyncEntryPoint, SM_TaskOfInt_RetInt)
756746
DEFINE_METHOD(ASYNC_HELPERS, HANDLE_ASYNC_ENTRYPOINT_VOID, HandleAsyncEntryPoint, SM_Task_RetVoid)
757-
758-
DEFINE_CLASS(TIMER_QUEUE, Threading, TimerQueue)
759-
DEFINE_METHOD(TIMER_QUEUE, TIMER_HANDLER, TimerHandler, SM_RetVoid)
760-
761-
DEFINE_CLASS(THREAD_POOL, Threading, ThreadPool)
762-
DEFINE_METHOD(THREAD_POOL, BACKGROUND_JOB_HANDLER, BackgroundJobHandler, SM_RetVoid)
763747
#endif // TARGET_BROWSER
764748

765749
DEFINE_CLASS(SPAN_HELPERS, System, SpanHelpers)
@@ -1077,7 +1061,6 @@ DEFINE_METHOD(STUBHELPERS, CLEAR_LAST_ERROR, ClearLastError,
10771061

10781062
DEFINE_METHOD(STUBHELPERS, THROW_INTEROP_PARAM_EXCEPTION, ThrowInteropParamException, SM_Int_Int_RetVoid)
10791063
DEFINE_METHOD(STUBHELPERS, ADD_TO_CLEANUP_LIST_SAFEHANDLE, AddToCleanupList, SM_RefCleanupWorkListElement_SafeHandle_RetIntPtr)
1080-
DEFINE_METHOD(STUBHELPERS, KEEP_ALIVE_VIA_CLEANUP_LIST, KeepAliveViaCleanupList, SM_RefCleanupWorkListElement_Obj_RetVoid)
10811064
DEFINE_METHOD(STUBHELPERS, DESTROY_CLEANUP_LIST, DestroyCleanupList, SM_RefCleanupWorkListElement_RetVoid)
10821065
DEFINE_METHOD(STUBHELPERS, GET_HR_EXCEPTION_OBJECT, GetHRExceptionObject, SM_Int_RetException)
10831066
DEFINE_METHOD(STUBHELPERS, GET_PENDING_EXCEPTION_OBJECT, GetPendingExceptionObject, SM_RetException)
@@ -1088,9 +1071,6 @@ DEFINE_METHOD(STUBHELPERS, GET_IENUMERATOR_TO_ENUM_VARIANT_MARSHALER, G
10881071

10891072
DEFINE_METHOD(STUBHELPERS, CHECK_STRING_LENGTH, CheckStringLength, SM_Int_RetVoid)
10901073

1091-
DEFINE_METHOD(STUBHELPERS, FMT_CLASS_UPDATE_NATIVE_INTERNAL, FmtClassUpdateNativeInternal, SM_Obj_PtrByte_RefCleanupWorkListElement_RetVoid)
1092-
DEFINE_METHOD(STUBHELPERS, FMT_CLASS_UPDATE_CLR_INTERNAL, FmtClassUpdateCLRInternal, SM_Obj_PtrByte_RetVoid)
1093-
DEFINE_METHOD(STUBHELPERS, LAYOUT_DESTROY_NATIVE_INTERNAL, LayoutDestroyNativeInternal, SM_Obj_PtrByte_RetVoid)
10941074
DEFINE_METHOD(STUBHELPERS, MARSHAL_TO_MANAGED_VA_LIST, MarshalToManagedVaList, SM_IntPtr_IntPtr_RetVoid)
10951075
DEFINE_METHOD(STUBHELPERS, MARSHAL_TO_UNMANAGED_VA_LIST, MarshalToUnmanagedVaList, SM_IntPtr_UInt_IntPtr_RetVoid)
10961076
DEFINE_METHOD(STUBHELPERS, CALC_VA_LIST_SIZE, CalcVaListSize, SM_IntPtr_RetUInt)

‎src/coreclr/vm/metasig.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,11 @@ DEFINE_METASIG(SM(RetBool, _, F))
219219
DEFINE_METASIG(SM(IntPtr_RetStr, I, s))
220220
DEFINE_METASIG(SM(IntPtr_RetBool, I, F))
221221
DEFINE_METASIG(SM(UInt_IntPtr_RetStr, K I, s))
222-
DEFINE_METASIG_T(SM(RuntimeType_RuntimeMethodHandleInternal_RetMethodBase, C(CLASS) g(METHOD_HANDLE_INTERNAL), C(METHOD_BASE) ))
223-
DEFINE_METASIG_T(SM(RuntimeType_IRuntimeFieldInfo_RetFieldInfo, C(CLASS) C(I_RT_FIELD_INFO), C(FIELD_INFO) ))
224222
DEFINE_METASIG(SM(Char_Bool_Bool_RetByte, u F F, b))
225223
DEFINE_METASIG(SM(Byte_RetChar, b, u))
226224
DEFINE_METASIG(SM(Str_Bool_Bool_RefInt_RetIntPtr, s F F r(i), I))
227225
DEFINE_METASIG(SM(IntPtr_Int_RetStr, I i, s))
228-
DEFINE_METASIG_T(SM(Obj_PtrByte_RefCleanupWorkListElement_RetVoid, j P(b) r(C(CLEANUP_WORK_LIST_ELEMENT)), v))
229226
DEFINE_METASIG_T(SM(SafeHandle_RefCleanupWorkListElement_RetIntPtr, C(SAFE_HANDLE) r(C(CLEANUP_WORK_LIST_ELEMENT)), I))
230-
DEFINE_METASIG(SM(Obj_PtrByte_RetVoid, j P(b), v))
231227
DEFINE_METASIG(SM(PtrByte_IntPtr_RetVoid, P(b) I, v))
232228
DEFINE_METASIG(SM(Str_Bool_Bool_RefInt_RetArrByte, s F F r(i), a(b) ))
233229
DEFINE_METASIG(SM(ArrByte_Int_PtrByte_Int_Int_RetVoid, a(b) i P(b) i i, v))
@@ -517,7 +513,6 @@ DEFINE_METASIG_T(IM(ArrType_ArrException_Str_RetVoid, a(C(TYPE)) a(C(EXCEPTION))
517513
DEFINE_METASIG(IM(RefInt_RefInt_RefInt_RetArrByte, r(i) r(i) r(i), a(b)))
518514
DEFINE_METASIG_T(IM(RefInt_RetRuntimeType, r(i) , C(CLASS)))
519515
DEFINE_METASIG_T(SM(IntPtr_RetRuntimeType, I , C(CLASS)))
520-
DEFINE_METASIG_T(IM(RuntimeType_RetVoid, C(CLASS) , v))
521516

522517
DEFINE_METASIG_T(IM(RuntimeArgumentHandle_PtrVoid_RetVoid, g(ARGUMENT_HANDLE) P(v), v))
523518

@@ -584,7 +579,6 @@ DEFINE_METASIG(SM(RefUShrt_UShrt_UShrt_RetUShrt, r(H) H H, H))
584579

585580
DEFINE_METASIG_T(SM(RefCleanupWorkListElement_RetVoid, r(C(CLEANUP_WORK_LIST_ELEMENT)), v))
586581
DEFINE_METASIG_T(SM(RefCleanupWorkListElement_SafeHandle_RetIntPtr, r(C(CLEANUP_WORK_LIST_ELEMENT)) C(SAFE_HANDLE), I))
587-
DEFINE_METASIG_T(SM(RefCleanupWorkListElement_Obj_RetVoid, r(C(CLEANUP_WORK_LIST_ELEMENT)) j, v))
588582

589583
DEFINE_METASIG(SM(PtrVoid_RetPtrVoid, P(v), P(v)))
590584
DEFINE_METASIG(IM(PtrVoid_RetVoid, P(v), v))

0 commit comments

Comments
 (0)