Skip to content

Commit 258c864

Browse files
committed
Fix Linux x64
1 parent 9ae216b commit 258c864

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/coreclr/vm/amd64/cgenamd64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void InlinedCallFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateF
210210
SyncRegDisplayToCurrentContext(pRD);
211211

212212
#ifdef FEATURE_INTERPRETER
213-
if ((m_Next != FRAME_TOP) && (m_Next->GetFrameIdentifier() == FrameIdentifier::InterpreterFrame))
213+
if ((m_Next != FRAME_TOP) && (m_Next != NULL) && (m_Next->GetFrameIdentifier() == FrameIdentifier::InterpreterFrame))
214214
{
215215
// If the next frame is an interpreter frame, we also need to set the first argument register to point to the interpreter frame.
216216
SetFirstArgReg(pRD->pCurrentContext, dac_cast<TADDR>(m_Next));

src/coreclr/vm/exceptionhandling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ BOOL HandleHardwareException(PAL_SEHException* ex)
15021502
exInfo.TakeExceptionPointersOwnership(ex);
15031503
}
15041504

1505-
INSTALL_RESUME_AFTER_CATCH_HANDLER_WITH_CONTEXT(exInfo.m_ptrs.ContextRecord);
1505+
INSTALL_RESUME_AFTER_CATCH_HANDLER_WITH_CONTEXT(fef.GetExceptionContext());
15061506
// m_exception is GC-reported via ExInfo chain scanning in ScanStackRoots.
15071507
// Do NOT also GCPROTECT it - reporting the same location twice corrupts
15081508
// the GC's relocation logic (see clr-code-guide.md §2.1.5).

src/coreclr/vm/wasm/helpers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ void InlinedCallFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateF
463463
SyncRegDisplayToCurrentContext(pRD);
464464

465465
#ifdef FEATURE_INTERPRETER
466-
if ((m_Next != FRAME_TOP) && (m_Next->GetFrameIdentifier() == FrameIdentifier::InterpreterFrame))
466+
if ((m_Next != FRAME_TOP) && (m_Next != NULL) && (m_Next->GetFrameIdentifier() == FrameIdentifier::InterpreterFrame))
467467
{
468468
// If the next frame is an interpreter frame, we also need to set the first argument register to point to the interpreter frame.
469469
SetFirstArgReg(pRD->pCurrentContext, dac_cast<TADDR>(m_Next));

0 commit comments

Comments
 (0)