2008-07-12 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / debug-mini.c

diff --git a/mono/mini/debug-mini.c b/mono/mini/debug-mini.c
index 65a7dfc57e1f2bf731d9c8b6a175e486c500831d..1a7dfebba81c43ce74078e13fbbdfaeeb30af7a6 100644 (file)
--- a/mono/mini/debug-mini.c
+++ b/mono/mini/debug-mini.c
@@ -79,15 +79,6 @@ record_line_number (MiniDebugMethodInfo *info, guint32 address, guint32 offset)
        g_array_append_val (info->line_numbers, lne);
 }
 
-static void
-mono_debug_free_method_jit_info (MonoDebugMethodJitInfo *jit)
-{
-       g_free (jit->line_numbers);
-       g_free (jit->this_var);
-       g_free (jit->params);
-       g_free (jit->locals);
-       g_free (jit);
-}
 
 void
 mono_debug_init_method (MonoCompile *cfg, MonoBasicBlock *start_block, guint32 breakpoint_id)
@@ -267,7 +258,8 @@ mono_debug_close_method (MonoCompile *cfg)
        jit->epilogue_begin = cfg->epilog_begin;
        jit->code_size = cfg->code_len;
 
-       record_line_number (info, jit->epilogue_begin, header->code_size);
+       if (jit->epilogue_begin)
+                  record_line_number (info, jit->epilogue_begin, header->code_size);
 
        jit->num_params = sig->param_count;
        jit->params = g_new0 (MonoDebugVarInfo, jit->num_params);
@@ -445,18 +437,17 @@ serialize_variable (MonoDebugVarInfo *var, guint8 *p, guint8 **endbuf)
 void
 mono_debug_serialize_debug_info (MonoCompile *cfg, guint8 **out_buf, guint32 *buf_len)
 {
-       MiniDebugMethodInfo *info;
        MonoDebugMethodJitInfo *jit;
        guint32 size, prev_offset, prev_native_offset;
        guint8 *buf, *p;
        int i;
 
-       info = (MiniDebugMethodInfo *) cfg->debug_info;
-       if (!info || !info->jit) {
+       /* Can't use cfg->debug_info as it is freed by close_method () */
+       jit = mono_debug_find_method (cfg->method, mono_domain_get ());
+       if (!jit) {
                *buf_len = 0;
                return;
        }
-       jit = info->jit;
 
        size = ((jit->num_params + jit->num_locals + 1) * 10) + (jit->num_line_numbers * 10) + 64;
        p = buf = g_malloc (size);
@@ -663,6 +654,7 @@ mono_debug_print_vars (gpointer ip, gboolean only_arguments)
                        print_var_info (&jit->locals [i], i, "", "Local");
                }
        }
+       mono_debug_free_method_jit_info (jit);
 }
 
 /*