diff --git a/src/coreclr/vm/amd64/cgenamd64.cpp b/src/coreclr/vm/amd64/cgenamd64.cpp index e89900341ec7db..b681e067680cec 100644 --- a/src/coreclr/vm/amd64/cgenamd64.cpp +++ b/src/coreclr/vm/amd64/cgenamd64.cpp @@ -349,16 +349,6 @@ void HijackFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateFloats pRD->pCurrentContextPointers->Rax = (PULONG64)&m_Args->Rax; SyncRegDisplayToCurrentContext(pRD); - -/* - // This only describes the top-most frame - pRD->pContext = NULL; - - - pRD->PCTAddr = dac_cast(m_Args) + offsetof(HijackArgs, Rip); - //pRD->pPC = PTR_SLOT(pRD->PCTAddr); - pRD->SP = (ULONG64)(pRD->PCTAddr + sizeof(TADDR)); -*/ } #endif // FEATURE_HIJACK diff --git a/src/coreclr/vm/exceptionhandling.cpp b/src/coreclr/vm/exceptionhandling.cpp index c4786039f7b5c1..13b9d4b131bb35 100644 --- a/src/coreclr/vm/exceptionhandling.cpp +++ b/src/coreclr/vm/exceptionhandling.cpp @@ -6302,39 +6302,6 @@ UMEntryPrestubUnwindFrameChainHandler( return disposition; } -EXTERN_C EXCEPTION_DISPOSITION -UMThunkStubUnwindFrameChainHandler( - IN PEXCEPTION_RECORD pExceptionRecord, - IN PVOID pEstablisherFrame, - IN OUT PCONTEXT pContextRecord, - IN OUT PDISPATCHER_CONTEXT pDispatcherContext - ) -{ - -#ifdef _DEBUG - // If the exception is escaping the last CLR personality routine on the stack, - // then state a flag on the thread to indicate so. - // - // We check for thread object since this function is the personality routine of the UMThunk - // and we can landup here even when thread creation (within the thunk) fails. - if (GetThreadNULLOk() != NULL) - { - SetReversePInvokeEscapingUnhandledExceptionStatus(IS_UNWINDING(pExceptionRecord->ExceptionFlags), - pEstablisherFrame - ); - } -#endif // _DEBUG - - EXCEPTION_DISPOSITION disposition = UMThunkUnwindFrameChainHandler( - pExceptionRecord, - pEstablisherFrame, - pContextRecord, - pDispatcherContext - ); - - return disposition; -} - // This is the personality routine setup for the assembly helper (CallDescrWorker) that calls into // managed code.