projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14297c8)
[x86/Linux] Set ResumeEsp as Caller Sp when unwond to native frame (#10838)
authorJonghyun Park <parjong@gmail.com>
Mon, 10 Apr 2017 13:21:11 +0000 (22:21 +0900)
committerJan Vorlicek <janvorli@microsoft.com>
Mon, 10 Apr 2017 13:21:11 +0000 (15:21 +0200)
src/unwinder/i386/unwinder_i386.cpp patch | blob | history

diff --git a/src/unwinder/i386/unwinder_i386.cpp b/src/unwinder/i386/unwinder_i386.cpp
index 5ce6e16524c51b269cd6bd3f4bc77ea8ebd63209..55f0766a7fda4ef51affc717f18be1bfb85490f3 100644 (file)
--- a/src/unwinder/i386/unwinder_i386.cpp
+++ b/src/unwinder/i386/unwinder_i386.cpp
@@ -117,7 +117,9 @@ OOPStackUnwinderX86::VirtualUnwind(
 #endif // UNIX_X86_ABI
 
     ContextRecord->Esp = rd.SP - paramSize;
-    ContextRecord->ResumeEsp = rd.SP + paddingSize;
+    ContextRecord->ResumeEsp = ExecutionManager::IsManagedCode((PCODE) rd.ControlPC)
+                             ? rd.SP + paddingSize
+                             : ContextRecord->Esp;
     ContextRecord->Eip = rd.ControlPC;
 
     // For x86, the value of Establisher Frame Pointer is Caller SP