Skip to content

Commit 28ab232

Browse files
janvorlijanvorli
committed
Remove unused ICodeManager methods
1 parent 0696b1a commit 28ab232

File tree

2 files changed

+0
-173
lines changed

2 files changed

+0
-173
lines changed

‎src/coreclr/inc/eetwain.h

-56
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,6 @@ virtual bool IsGcSafe(EECodeInfo *pCodeInfo,
217217
virtual bool HasTailCalls(EECodeInfo *pCodeInfo) = 0;
218218
#endif // TARGET_ARM || TARGET_ARM64 || TARGET_LOONGARCH64 || TARGET_RISCV64
219219

220-
#if defined(TARGET_AMD64) && defined(_DEBUG)
221-
/*
222-
Locates the end of the last interruptible region in the given code range.
223-
Returns 0 if the entire range is uninterruptible. Returns the end point
224-
if the entire range is interruptible.
225-
*/
226-
virtual unsigned FindEndOfLastInterruptibleRegion(unsigned curOffset,
227-
unsigned endOffset,
228-
GCInfoToken gcInfoToken) = 0;
229-
#endif // TARGET_AMD64 && _DEBUG
230-
231220
/*
232221
Enumerate all live object references in that function using
233222
the virtual register set. Same reference location cannot be enumerated
@@ -321,11 +310,6 @@ virtual unsigned int GetFrameSize(GCInfoToken gcInfoToken) = 0;
321310
#ifndef FEATURE_EH_FUNCLETS
322311
virtual const BYTE* GetFinallyReturnAddr(PREGDISPLAY pReg)=0;
323312

324-
virtual BOOL IsInFilter(GCInfoToken gcInfoToken,
325-
unsigned offset,
326-
PCONTEXT pCtx,
327-
DWORD curNestLevel) = 0;
328-
329313
virtual BOOL LeaveFinally(GCInfoToken gcInfoToken,
330314
unsigned offset,
331315
PCONTEXT pCtx) = 0;
@@ -462,18 +446,6 @@ virtual
462446
bool HasTailCalls(EECodeInfo *pCodeInfo);
463447
#endif // TARGET_ARM || TARGET_ARM64 || TARGET_LOONGARCH64 || defined(TARGET_RISCV64)
464448

465-
#if defined(TARGET_AMD64) && defined(_DEBUG)
466-
/*
467-
Locates the end of the last interruptible region in the given code range.
468-
Returns 0 if the entire range is uninterruptible. Returns the end point
469-
if the entire range is interruptible.
470-
*/
471-
virtual
472-
unsigned FindEndOfLastInterruptibleRegion(unsigned curOffset,
473-
unsigned endOffset,
474-
GCInfoToken gcInfoToken);
475-
#endif // TARGET_AMD64 && _DEBUG
476-
477449
/*
478450
Enumerate all live object references in that function using
479451
the virtual register set. Same reference location cannot be enumerated
@@ -588,10 +560,6 @@ unsigned int GetFrameSize(GCInfoToken gcInfoToken);
588560

589561
#ifndef FEATURE_EH_FUNCLETS
590562
virtual const BYTE* GetFinallyReturnAddr(PREGDISPLAY pReg);
591-
virtual BOOL IsInFilter(GCInfoToken gcInfoToken,
592-
unsigned offset,
593-
PCONTEXT pCtx,
594-
DWORD curNestLevel);
595563
virtual BOOL LeaveFinally(GCInfoToken gcInfoToken,
596564
unsigned offset,
597565
PCONTEXT pCtx);
@@ -737,22 +705,6 @@ bool HasTailCalls(EECodeInfo *pCodeInfo)
737705
}
738706
#endif // TARGET_ARM || TARGET_ARM64 || TARGET_LOONGARCH64 || defined(TARGET_RISCV64)
739707

740-
#if defined(TARGET_AMD64) && defined(_DEBUG)
741-
/*
742-
Locates the end of the last interruptible region in the given code range.
743-
Returns 0 if the entire range is uninterruptible. Returns the end point
744-
if the entire range is interruptible.
745-
*/
746-
virtual
747-
unsigned FindEndOfLastInterruptibleRegion(unsigned curOffset,
748-
unsigned endOffset,
749-
GCInfoToken gcInfoToken)
750-
{
751-
_ASSERTE(FALSE);
752-
return 0;
753-
}
754-
#endif // TARGET_AMD64 && _DEBUG
755-
756708
/*
757709
Enumerate all live object references in that function using
758710
the virtual register set. Same reference location cannot be enumerated
@@ -867,14 +819,6 @@ virtual const BYTE* GetFinallyReturnAddr(PREGDISPLAY pReg)
867819
return NULL;
868820
}
869821

870-
virtual BOOL IsInFilter(GCInfoToken gcInfoToken,
871-
unsigned offset,
872-
PCONTEXT pCtx,
873-
DWORD curNestLevel)
874-
{
875-
_ASSERTE(FALSE);
876-
return FALSE;
877-
}
878822
virtual BOOL LeaveFinally(GCInfoToken gcInfoToken,
879823
unsigned offset,
880824
PCONTEXT pCtx)

‎src/coreclr/vm/eetwain.cpp

-117
Original file line numberDiff line numberDiff line change
@@ -872,86 +872,6 @@ bool EECodeManager::HasTailCalls( EECodeInfo *pCodeInfo)
872872
}
873873
#endif // TARGET_ARM || TARGET_ARM64 || TARGET_LOONGARCH64 || TARGET_RISCV64
874874

875-
#if defined(TARGET_AMD64) && defined(_DEBUG)
876-
877-
struct FindEndOfLastInterruptibleRegionState
878-
{
879-
unsigned curOffset;
880-
unsigned endOffset;
881-
unsigned lastRangeOffset;
882-
};
883-
884-
bool FindEndOfLastInterruptibleRegionCB (
885-
UINT32 startOffset,
886-
UINT32 stopOffset,
887-
LPVOID hCallback)
888-
{
889-
FindEndOfLastInterruptibleRegionState *pState = (FindEndOfLastInterruptibleRegionState*)hCallback;
890-
891-
//
892-
// If the current range doesn't overlap the given range, keep searching.
893-
//
894-
if ( startOffset >= pState->endOffset
895-
|| stopOffset < pState->curOffset)
896-
{
897-
return false;
898-
}
899-
900-
//
901-
// If the range overlaps the end, then the last point is the end.
902-
//
903-
if ( stopOffset > pState->endOffset
904-
/*&& startOffset < pState->endOffset*/)
905-
{
906-
// The ranges should be sorted in increasing order.
907-
CONSISTENCY_CHECK(startOffset >= pState->lastRangeOffset);
908-
909-
pState->lastRangeOffset = pState->endOffset;
910-
return true;
911-
}
912-
913-
//
914-
// See if the end of this range is the closet to the end that we've found
915-
// so far.
916-
//
917-
if (stopOffset > pState->lastRangeOffset)
918-
pState->lastRangeOffset = stopOffset;
919-
920-
return false;
921-
}
922-
923-
/*
924-
Locates the end of the last interruptible region in the given code range.
925-
Returns 0 if the entire range is uninterruptible. Returns the end point
926-
if the entire range is interruptible.
927-
*/
928-
unsigned EECodeManager::FindEndOfLastInterruptibleRegion(unsigned curOffset,
929-
unsigned endOffset,
930-
GCInfoToken gcInfoToken)
931-
{
932-
#ifndef DACCESS_COMPILE
933-
GcInfoDecoder gcInfoDecoder(
934-
gcInfoToken,
935-
DECODE_FOR_RANGES_CALLBACK
936-
);
937-
938-
FindEndOfLastInterruptibleRegionState state;
939-
state.curOffset = curOffset;
940-
state.endOffset = endOffset;
941-
state.lastRangeOffset = 0;
942-
943-
gcInfoDecoder.EnumerateInterruptibleRanges(&FindEndOfLastInterruptibleRegionCB, &state);
944-
945-
return state.lastRangeOffset;
946-
#else
947-
DacNotImpl();
948-
return 0;
949-
#endif // #ifndef DACCESS_COMPILE
950-
}
951-
952-
#endif // TARGET_AMD64 && _DEBUG
953-
954-
955875
#else // !USE_GC_INFO_DECODER
956876

957877
/*****************************************************************************
@@ -2142,43 +2062,6 @@ const BYTE* EECodeManager::GetFinallyReturnAddr(PREGDISPLAY pReg)
21422062
return *(const BYTE**)(size_t)(GetRegdisplaySP(pReg));
21432063
}
21442064

2145-
BOOL EECodeManager::IsInFilter(GCInfoToken gcInfoToken,
2146-
unsigned offset,
2147-
PCONTEXT pCtx,
2148-
DWORD curNestLevel)
2149-
{
2150-
CONTRACTL {
2151-
NOTHROW;
2152-
GC_NOTRIGGER;
2153-
} CONTRACTL_END;
2154-
2155-
/* Extract the necessary information from the info block header */
2156-
2157-
hdrInfo info;
2158-
2159-
DecodeGCHdrInfo(gcInfoToken,
2160-
offset,
2161-
&info);
2162-
2163-
/* make sure that we have an ebp stack frame */
2164-
2165-
_ASSERTE(info.ebpFrame);
2166-
_ASSERTE(info.handlers); // <TODO> This will always be set. Remove it</TODO>
2167-
2168-
TADDR baseSP;
2169-
DWORD nestingLevel;
2170-
2171-
FrameType frameType = GetHandlerFrameInfo(&info, pCtx->Ebp,
2172-
pCtx->Esp, (DWORD) IGNORE_VAL,
2173-
&baseSP, &nestingLevel);
2174-
_ASSERTE(frameType != FR_INVALID);
2175-
2176-
// _ASSERTE(nestingLevel == curNestLevel);
2177-
2178-
return frameType == FR_FILTER;
2179-
}
2180-
2181-
21822065
BOOL EECodeManager::LeaveFinally(GCInfoToken gcInfoToken,
21832066
unsigned offset,
21842067
PCONTEXT pCtx)

0 commit comments

Comments
 (0)