From 8d4cfdb986165051979a1d51b999b3287c3e7481 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Wed, 1 Feb 2017 10:36:36 +0900 Subject: [x86/Linux] Update pCurrentContextPointers properly in EnsureCallerContextIsValid (#9232) --- src/vm/eetwain.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/vm') diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index b2387b2834..f7257f537f 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -3072,13 +3072,9 @@ void EECodeManager::EnsureCallerContextIsValid( PREGDISPLAY pRD, StackwalkCache { // We need to make a copy here (instead of switching the pointers), in order to preserve the current context *(pRD->pCallerContext) = *(pRD->pCurrentContext); - - NOT_X86(*(pRD->pCallerContextPointers) = *(pRD->pCurrentContextPointers)); - - T_KNONVOLATILE_CONTEXT_POINTERS *pCallerContextPointers = NULL; - NOT_X86(pCallerContextPointers = pRD->pCallerContextPointers); + *(pRD->pCallerContextPointers) = *(pRD->pCurrentContextPointers); - Thread::VirtualUnwindCallFrame(pRD->pCallerContext, pCallerContextPointers, pCodeInfo); + Thread::VirtualUnwindCallFrame(pRD->pCallerContext, pRD->pCallerContextPointers, pCodeInfo); } pRD->IsCallerContextValid = TRUE; -- cgit v1.2.3