Merge pull request dotnet#4655 from swaroop-sridhar/aagc3

ARM64: Update FP-context-pointer in ExceptionFrame
DrewScoggins · Apr 29, 2016 · 23d0b7a · 23d0b7a
2 parents f03813f + c738dd8
commit 23d0b7a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git 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.