[mono/mono] 36cf9822: [jit] Fix fbd9fd71679f626fabe0b1bd7f923836f98252b4, a wrong version was commited.

"Zoltan Varga ([email protected])" <[email protected]> Sat, 2 Nov 2013 02:27:41 +0000

Newsgroups	gmane.comp.gnome.mono.patches
Message-ID	<0000014216a329f9-3fbd97d1-36d9-4c8b-a9d4-c2b2280f4f76-000000@email.amazonses.com>

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/0cf6982962fd...36cf9822229b

   Commit: 36cf9822229b627438a11d90ba35334ce10f2e3b
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-11-02 02:26:33 GMT
      URL: https://github.com/mono/mono/commit/36cf9822229b627438a11d90ba35334ce10f2e3b

[jit] Fix fbd9fd71679f626fabe0b1bd7f923836f98252b4, a wrong version was commited.

Changed paths:
  M mono/mini/exceptions-x86.c

Modified: mono/mini/exceptions-x86.c
===================================================================
@@ -865,7 +865,7 @@ void win32_seh_set_handler(int type, MonoW32ExceptionHandler handler)
 			else
 				/* In non-trampoline frames, ebp is the frame pointer */
 				lmf_esp = (gpointer)(*lmf)->ebp;
-			if (!is_tramp && MONO_CONTEXT_GET_SP (ctx) >= (gpointer)(*lmf)->ebp)
+			if (MONO_CONTEXT_GET_SP (ctx) >= lmf_esp)
 				/* remove any unused lmf */
 				*lmf = (gpointer)(((gsize)(*lmf)->previous_lmf) & ~3);
 		}


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches