From: Jonghyun Park <parjong@gmail.com>
Date: Fri, 21 Apr 2017 15:51:12 +0000 (+0900)
Subject: [x86/Linux] Correctly initialize nonVolRegPtrs in LazyMachState::unwindLazyState... 
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7168
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5cc8aed33c27ed3ad816142aac45d8488abb1e8;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

[x86/Linux] Correctly initialize nonVolRegPtrs in LazyMachState::unwindLazyState (dotnet/coreclr#10888)



Commit migrated from https://github.com/dotnet/coreclr/commit/b5e4d03243de5fea54ac478e66e051ed19f55f6b
---

diff --git a/src/coreclr/src/vm/i386/gmsx86.cpp b/src/coreclr/src/vm/i386/gmsx86.cpp
index 840a50d..2852b92 100644
--- a/src/coreclr/src/vm/i386/gmsx86.cpp
+++ b/src/coreclr/src/vm/i386/gmsx86.cpp
@@ -1295,10 +1295,10 @@ void LazyMachState::unwindLazyState(LazyMachState* baseState,
     ctx.Esi = lazyState->_esi = baseState->_esi;
     ctx.Ebx = lazyState->_ebx = baseState->_ebx;
 
-    nonVolRegPtrs.Edi = &(lazyState->_edi);
-    nonVolRegPtrs.Esi = &(lazyState->_esi);
-    nonVolRegPtrs.Ebx = &(lazyState->_ebx);
-    nonVolRegPtrs.Ebp = &(lazyState->_ebp);
+    nonVolRegPtrs.Edi = &(baseState->_edi);
+    nonVolRegPtrs.Esi = &(baseState->_esi);
+    nonVolRegPtrs.Ebx = &(baseState->_ebx);
+    nonVolRegPtrs.Ebp = &(baseState->_ebp);
 
     PCODE pvControlPc;