From: Jan Kotas <jkotas@microsoft.com>
Date: Mon, 6 Aug 2018 22:43:30 +0000 (-0700)
Subject: Port x86 unwinder fix from .NET Framework (#19311)
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c10efe004d8720a799bf666d3fac3b800f204848;p=platform%2Fupstream%2Fcoreclr.git

Port x86 unwinder fix from .NET Framework (#19311)

We have not hit this case in CoreCLR yet, but there is a good chance that we will at some point.
---

diff --git a/src/vm/i386/gmsx86.cpp b/src/vm/i386/gmsx86.cpp
index 64ac4a38ba..53bd23fba2 100644
--- a/src/vm/i386/gmsx86.cpp
+++ b/src/vm/i386/gmsx86.cpp
@@ -126,7 +126,7 @@ static bool shouldEnterCall(PTR_BYTE ip) {
 
     int pushes = 0;
 
-    // we should start unbalenced pops within 48 instrs. If not, it is not a special epilog function
+    // we should start unbalanced pops within 48 instrs. If not, it is not a special epilog function
     // the only reason we need as many instructions as we have below is because  coreclr
     // gets instrumented for profiling, code coverage, BBT etc, and we want these things to
     // just work.
@@ -134,6 +134,7 @@ static bool shouldEnterCall(PTR_BYTE ip) {
         switch(*ip) {
             case 0xF2:              // repne
             case 0xF3:              // repe
+            case 0x90:              // nop
                 ip++;
                 break;