Skip to content

Commit ad12574

Browse files
authored
Delete ECHash (#117861)
We do not need FCall entrypoint to MethodDesc reverse mappinng now that there are no FCall with HelperMethodFrames
1 parent c6b844e commit ad12574

21 files changed

+48
-427
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,8 +1583,7 @@ internal static void ValidateObject(object obj, IntPtr pMD)
15831583
internal static partial void ValidateByref(IntPtr byref, IntPtr pMD); // the byref is pinned so we can safely "cast" it to IntPtr
15841584

15851585
[Intrinsic]
1586-
[MethodImpl(MethodImplOptions.InternalCall)]
1587-
internal static extern IntPtr GetStubContext();
1586+
internal static IntPtr GetStubContext() => throw new UnreachableException(); // Unconditionally expanded intrinsic
15881587

15891588
[MethodImpl(MethodImplOptions.NoInlining)]
15901589
internal static void MulticastDebuggerTraceHelper(object o, int count)
@@ -1596,11 +1595,10 @@ internal static void MulticastDebuggerTraceHelper(object o, int count)
15961595
private static partial void MulticastDebuggerTraceHelperQCall(ObjectHandleOnStack obj, int count);
15971596

15981597
[Intrinsic]
1599-
[MethodImpl(MethodImplOptions.InternalCall)]
1600-
internal static extern IntPtr NextCallReturnAddress();
1598+
internal static IntPtr NextCallReturnAddress() => throw new UnreachableException(); // Unconditionally expanded intrinsic
16011599

16021600
[Intrinsic]
1603-
internal static Continuation? AsyncCallContinuation() => null;
1601+
internal static Continuation? AsyncCallContinuation() => throw new UnreachableException(); // Unconditionally expanded intrinsic
16041602
} // class StubHelpers
16051603

16061604
#if FEATURE_COMINTEROP

src/coreclr/debug/daccess/reimpl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ DacGetThread(ULONG32 osThread)
3838
UNREACHABLE();
3939
}
4040

41-
// Note that if we had access to TLS, we could get this at index gThreadTLSIndex for the specified
42-
// thread. However, this is the only place we might want to use TLS, and it's not performance critical,
43-
// so we haven't added TLS support to ICorDebugDataTarget (the legacy ICLRDataTarget interface has it though)
41+
// Note that if we had access to TLS, we could get this at TLS for the specified thread. However, this is
42+
// the only place we might want to use TLS, and it's not performance critical, so we haven't added TLS support
43+
// to ICorDebugDataTarget (the legacy ICLRDataTarget interface has it though)
4444

4545
// Scan the whole thread store to see if there's a matching thread.
4646

src/coreclr/debug/ee/dactable.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@
2222

2323
#ifdef DEBUGGING_SUPPORTED
2424

25-
extern PTR_ECHash gFCallMethods[FCALL_HASH_SIZE];
26-
extern TADDR gLowestFCall;
27-
extern TADDR gHighestFCall;
2825
extern PCODE g_FCDynamicallyAssignedImplementations[ECall::NUM_DYNAMICALLY_ASSIGNED_FCALL_IMPLEMENTATIONS];
29-
extern DWORD gThreadTLSIndex;
30-
extern DWORD gAppDomainTLSIndex;
3126
extern "C" void STDCALL ThePreStubPatchLabel(void);
3227

3328
#ifdef FEATURE_COMWRAPPERS

src/coreclr/inc/daccess.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@
290290
//
291291
// SystemDomain::m_appDomainIndexList;
292292
//
293-
// extern DWORD gThreadTLSIndex;
293+
// extern DWORD g_TlsIndex;
294294
//
295-
// DWORD gThreadTLSIndex = TLS_OUT_OF_INDEXES;
295+
// DWORD g_TlsIndex = TLS_OUT_OF_INDEXES;
296296
//
297297
// Modified Code:
298298
//
@@ -312,9 +312,9 @@
312312
//
313313
// SVAL_IMPL(ArrayListStatic, SystemDomain, m_appDomainIndexList);
314314
//
315-
// GVAL_DECL(DWORD, gThreadTLSIndex);
315+
// GVAL_DECL(DWORD, g_TlsIndex);
316316
//
317-
// GVAL_IMPL_INIT(DWORD, gThreadTLSIndex, TLS_OUT_OF_INDEXES);
317+
// GVAL_IMPL_INIT(DWORD, g_TlsIndex, TLS_OUT_OF_INDEXES);
318318
//
319319
// When declaring the variable, the first argument declares the
320320
// variable's type and the second argument declares the variable's

src/coreclr/inc/dacvars.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,6 @@ DEFINE_DACVAR(BOOL, Debugger__s_fCanChangeNgenFlags, Debugger::s_fCanChangeNgenF
195195
DEFINE_DACVAR(PTR_DebuggerPatchTable, DebuggerController__g_patches, DebuggerController::g_patches)
196196
DEFINE_DACVAR(BOOL, DebuggerController__g_patchTableValid, DebuggerController::g_patchTableValid)
197197

198-
DEFINE_DACVAR(SIZE_T, dac__gLowestFCall, ::gLowestFCall)
199-
DEFINE_DACVAR(SIZE_T, dac__gHighestFCall, ::gHighestFCall)
200-
DEFINE_DACVAR(SIZE_T, dac__gFCallMethods, ::gFCallMethods)
201-
202198
DEFINE_DACVAR(PTR_SyncTableEntry, dac__g_pSyncTable, ::g_pSyncTable)
203199
#ifdef FEATURE_COMINTEROP
204200
DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pRCWCleanupList, ::g_pRCWCleanupList)

src/coreclr/vm/ceeload.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4609,8 +4609,6 @@ void Module::EnumMemoryRegions(CLRDataEnumMemoryFlags flags,
46094609
}
46104610
}
46114611

4612-
ECall::EnumFCallMethods();
4613-
46144612
#ifdef FEATURE_METADATA_UPDATER
46154613
m_ClassList.EnumMemoryRegions();
46164614

src/coreclr/vm/ceemain.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -825,9 +825,6 @@ void EEStartupHelper()
825825
// Static initialization
826826
SystemDomain::Attach();
827827

828-
// Start up the EE initializing all the global variables
829-
ECall::Init();
830-
831828
COMDelegate::Init();
832829

833830
ExecutionManager::Init();

src/coreclr/vm/comdependenthandle.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ extern "C" OBJECTHANDLE QCALLTYPE DependentHandle_InternalAllocWithGCTransition(
4343
FCIMPL1(Object*, DependentHandle::InternalGetTarget, OBJECTHANDLE handle)
4444
{
4545
FCALL_CONTRACT;
46-
FCUnique(0x54);
4746

4847
_ASSERTE(handle != NULL);
4948

0 commit comments

Comments
 (0)