From c738dd88c4f29684d4b75afccb87be6ce8a196af Mon Sep 17 00:00:00 2001 From: Swaroop Sridhar Date: Thu, 28 Apr 2016 14:50:40 -0700 Subject: ARM64: Update FP-context-pointer in ExceptionFrame Update the CurrentContextPointers for FP and LR registers in FaultingExceptionFrame::UpdateRegDisplay() This change fixes a few GCStress=0xC failures on ARM64. --- src/vm/arm64/stubs.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/vm/arm64/stubs.cpp') diff --git a/src/vm/arm64/stubs.cpp b/src/vm/arm64/stubs.cpp index c50fdca7f7..eef079158f 100644 --- a/src/vm/arm64/stubs.cpp +++ b/src/vm/arm64/stubs.cpp @@ -734,10 +734,8 @@ void FaultingExceptionFrame::UpdateRegDisplay(const PREGDISPLAY pRD) pRD->pCurrentContextPointers->X26 = (PDWORD64)&m_ctx.X26; pRD->pCurrentContextPointers->X27 = (PDWORD64)&m_ctx.X27; pRD->pCurrentContextPointers->X28 = (PDWORD64)&m_ctx.X28; - pRD->pCurrentContextPointers->Fp = NULL; - pRD->pCurrentContextPointers->Lr = NULL; - - + pRD->pCurrentContextPointers->Fp = (PDWORD64)&m_ctx.Fp; + pRD->pCurrentContextPointers->Lr = (PDWORD64)&m_ctx.Lr; pRD->IsCallerContextValid = FALSE; pRD->IsCallerSPValid = FALSE; // Don't add usage of this field. This is only temporary. -- cgit v1.2.3