Merge pull request #1491 from akoeplinger/fix-async_read

[mono.git] / mono / mini / exceptions-x86.c

diff --git a/mono/mini/exceptions-x86.c b/mono/mini/exceptions-x86.c
index 5b91a476dac2594ca10f24b7c33e6c15c9cc20de..d21a7413ad19015f51fa5b8414be5d8fdb2599c5 100755 (executable)
--- a/mono/mini/exceptions-x86.c
+++ b/mono/mini/exceptions-x86.c
@@ -826,14 +826,12 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
 
                        return TRUE;
                }
-               
+
                if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->eip, NULL))) {
+                       frame->ji = ji;
                } else {
-                       if (!((guint32)((*lmf)->previous_lmf) & 1))
-                               /* Top LMF entry */
+                       if (!(*lmf)->method)
                                return FALSE;
-                       g_assert_not_reached ();
-                       /* Trampoline lmf frame */
                        frame->method = (*lmf)->method;
                }
 
@@ -846,7 +844,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
                /* Adjust IP */
                new_ctx->eip --;
 
-               frame->ji = ji;
                frame->type = FRAME_TYPE_MANAGED_TO_NATIVE;
 
                /* Check if we are in a trampoline LMF frame */