Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 38ae7da

Browse files
parjongjkotas
authored andcommitted
Remove unused code from excepx86.cpp (#11602)
1 parent 1cf39a4 commit 38ae7da

File tree

1 file changed

+0
-33
lines changed

1 file changed

+0
-33
lines changed

src/vm/i386/excepx86.cpp

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ CPFH_AdjustContextForThreadSuspensionRace(CONTEXT *pContext, Thread *pThread)
370370
{
371371
WRAPPER_NO_CONTRACT;
372372

373-
#ifndef FEATURE_PAL
374373
PCODE f_IP = GetIP(pContext);
375374
if (Thread::IsAddrOfRedirectFunc((PVOID)f_IP)) {
376375

@@ -427,9 +426,6 @@ CPFH_AdjustContextForThreadSuspensionRace(CONTEXT *pContext, Thread *pThread)
427426
SetIP(pContext, GetIP(pThread->m_OSContext) - 1);
428427
STRESS_LOG1(LF_EH, LL_INFO100, "CPFH_AdjustContextForThreadSuspensionRace: Case 4 setting IP = %x\n", pContext->Eip);
429428
}
430-
#else
431-
PORTABILITY_ASSERT("CPFH_AdjustContextForThreadSuspensionRace");
432-
#endif
433429
}
434430
#endif // FEATURE_HIJACK
435431

@@ -1147,7 +1143,6 @@ CPFH_RealFirstPassHandler( // ExceptionContinueSearch, etc.
11471143

11481144
pExInfo->m_pExceptionPointers = &exceptionPointers;
11491145

1150-
#ifndef FEATURE_PAL
11511146
if (bRethrownException || bNestedException)
11521147
{
11531148
_ASSERTE(pExInfo->m_pPrevNestedInfo != NULL);
@@ -1156,7 +1151,6 @@ CPFH_RealFirstPassHandler( // ExceptionContinueSearch, etc.
11561151
SetStateForWatsonBucketing(bRethrownException, pExInfo->GetPreviousExceptionTracker()->GetThrowableAsHandle());
11571152
END_SO_INTOLERANT_CODE;
11581153
}
1159-
#endif
11601154

11611155
#ifdef DEBUGGING_SUPPORTED
11621156
//
@@ -1971,17 +1965,10 @@ PTR_CONTEXT GetCONTEXTFromRedirectedStubStackFrame(CONTEXT * pContext)
19711965
}
19721966

19731967
#if !defined(DACCESS_COMPILE)
1974-
#ifdef FEATURE_PAL
1975-
static PEXCEPTION_REGISTRATION_RECORD CurrentSEHRecord = EXCEPTION_CHAIN_END;
1976-
#endif
1977-
19781968
PEXCEPTION_REGISTRATION_RECORD GetCurrentSEHRecord()
19791969
{
19801970
WRAPPER_NO_CONTRACT;
19811971

1982-
#ifdef FEATURE_PAL
1983-
LPVOID fs0 = CurrentSEHRecord;
1984-
#else // FEATURE_PAL
19851972
LPVOID fs0 = (LPVOID)__readfsdword(0);
19861973

19871974
#if 0 // This walk is too expensive considering we hit it every time we a CONTRACT(NOTHROW)
@@ -2013,24 +2000,18 @@ PEXCEPTION_REGISTRATION_RECORD GetCurrentSEHRecord()
20132000
}
20142001
#endif
20152002
#endif // 0
2016-
#endif // FEATURE_PAL
20172003

20182004
return (EXCEPTION_REGISTRATION_RECORD*) fs0;
20192005
}
20202006

20212007
PEXCEPTION_REGISTRATION_RECORD GetFirstCOMPlusSEHRecord(Thread *pThread) {
20222008
WRAPPER_NO_CONTRACT;
2023-
#ifndef FEATURE_PAL
20242009
EXCEPTION_REGISTRATION_RECORD *pEHR = *(pThread->GetExceptionListPtr());
20252010
if (pEHR == EXCEPTION_CHAIN_END || IsUnmanagedToManagedSEHHandler(pEHR)) {
20262011
return pEHR;
20272012
} else {
20282013
return GetNextCOMPlusSEHRecord(pEHR);
20292014
}
2030-
#else // FEATURE_PAL
2031-
PORTABILITY_ASSERT("GetFirstCOMPlusSEHRecord");
2032-
return NULL;
2033-
#endif // FEATURE_PAL
20342015
}
20352016

20362017

@@ -2056,11 +2037,7 @@ PEXCEPTION_REGISTRATION_RECORD GetPrevSEHRecord(EXCEPTION_REGISTRATION_RECORD *n
20562037
VOID SetCurrentSEHRecord(EXCEPTION_REGISTRATION_RECORD *pSEH)
20572038
{
20582039
WRAPPER_NO_CONTRACT;
2059-
#ifndef FEATURE_PAL
20602040
*GetThread()->GetExceptionListPtr() = pSEH;
2061-
#else // FEATURE_PAL
2062-
_ASSERTE("NYI");
2063-
#endif // FEATURE_PAL
20642041
}
20652042

20662043

@@ -2097,7 +2074,6 @@ BOOL PopNestedExceptionRecords(LPVOID pTargetSP, BOOL bCheckForUnknownHandlers)
20972074
STATIC_CONTRACT_GC_NOTRIGGER;
20982075
STATIC_CONTRACT_SO_TOLERANT;
20992076

2100-
#ifndef FEATURE_PAL
21012077
PEXCEPTION_REGISTRATION_RECORD pEHR = GetCurrentSEHRecord();
21022078

21032079
while ((LPVOID)pEHR < pTargetSP)
@@ -2153,10 +2129,6 @@ BOOL PopNestedExceptionRecords(LPVOID pTargetSP, BOOL bCheckForUnknownHandlers)
21532129
SetCurrentSEHRecord(pEHR);
21542130
}
21552131
return FALSE;
2156-
#else // FEATURE_PAL
2157-
PORTABILITY_ASSERT("PopNestedExceptionRecords");
2158-
return FALSE;
2159-
#endif // FEATURE_PAL
21602132
}
21612133

21622134
//
@@ -2261,7 +2233,6 @@ int COMPlusThrowCallbackHelper(IJitManager *pJitManager,
22612233

22622234
int iFilt = 0;
22632235

2264-
#ifndef FEATURE_PAL
22652236
EX_TRY
22662237
{
22672238
GCPROTECT_BEGIN (throwable);
@@ -2290,10 +2261,6 @@ int COMPlusThrowCallbackHelper(IJitManager *pJitManager,
22902261
EX_END_CATCH(SwallowAllExceptions)
22912262

22922263
return iFilt;
2293-
#else // FEATURE_PAL
2294-
PORTABILITY_ASSERT("COMPlusThrowCallbackHelper");
2295-
return EXCEPTION_CONTINUE_SEARCH;
2296-
#endif // FEATURE_PAL
22972264
}
22982265

22992266
//******************************************************************************

0 commit comments

Comments
 (0)