Author: zoltan
Date: 2008-01-30 15:47:52 -0500 (Wed, 30 Jan 2008)
New Revision: 94418

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/exceptions-x86.c
Log:
2008-01-30  Zoltan Varga  <[EMAIL PROTECTED]>

        * exceptions-x86.c (mono_arch_find_jit_info): Fix stack unwinding when 
an
        exception happens while compiling a virtual method.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2008-01-30 20:47:27 UTC (rev 94417)
+++ trunk/mono/mono/mini/ChangeLog      2008-01-30 20:47:52 UTC (rev 94418)
@@ -1,3 +1,8 @@
+2008-01-30  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * exceptions-x86.c (mono_arch_find_jit_info): Fix stack unwinding when 
an
+       exception happens while compiling a virtual method.
+
 2008-01-29  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * mini-sparc.c (mono_arch_emit_epilog): Fix folding of negative return 
values.

Modified: trunk/mono/mono/mini/exceptions-x86.c
===================================================================
--- trunk/mono/mono/mini/exceptions-x86.c       2008-01-30 20:47:27 UTC (rev 
94417)
+++ trunk/mono/mono/mini/exceptions-x86.c       2008-01-30 20:47:52 UTC (rev 
94418)
@@ -669,7 +669,8 @@
 
                        /* Pop arguments off the stack */
                        /* FIXME: Handle the delegate case too ((*lmf)->method 
== NULL) */
-                       if ((*lmf)->method) {
+                       /* FIXME: Handle the IMT/vtable case too */
+                       if ((*lmf)->method && (*lmf)->method != 
MONO_FAKE_IMT_METHOD && (*lmf)->method != MONO_FAKE_VTABLE_METHOD) {
                                MonoMethod *method = (*lmf)->method;
                                MonoJitArgumentInfo *arg_info = g_newa 
(MonoJitArgumentInfo, mono_method_signature (method)->param_count + 1);
 

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

Reply via email to