Merge pull request #5714 from alexischr/update_bockbuild

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

diff --git a/mono/mini/debug-mini.c b/mono/mini/debug-mini.c
index 41e241a33a8bf1a14ee1b64f4f07f5773fac4a0e..30874eb3cf3572ab48f24d98b7a058e13ce5b8a0 100644 (file)
--- a/mono/mini/debug-mini.c
+++ b/mono/mini/debug-mini.c
@@ -1,5 +1,6 @@
-/*
- * debug-mini.c: Mini-specific debugging stuff.
+/**
+ * \file
+ * Mini-specific debugging stuff.
  *
  * Author:
  *   Martin Baulig (martin@ximian.com)
@@ -16,7 +17,7 @@
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/threads-types.h>
 
-#include <mono/metadata/mono-debug-debugger.h>
+#include <mono/metadata/debug-internals.h>
 
 #include <mono/utils/valgrind.h>
 
@@ -152,7 +153,7 @@ mono_debug_add_vg_method (MonoMethod *method, MonoDebugMethodJitInfo *jit)
                for (i = 0; i < header->code_size; ++i) {
                        MonoDebugSourceLocation *location;
 
-                       location = mono_debug_symfile_lookup_location (minfo, i);
+                       location = mono_debug_method_lookup_location (minfo, i);
                        if (!location)
                                continue;
 
@@ -240,7 +241,7 @@ mono_debug_close_method (MonoCompile *cfg)
        jit->code_start = cfg->native_code;
        jit->epilogue_begin = cfg->epilog_begin;
        jit->code_size = cfg->code_len;
-       jit->has_var_info = debug_options.mdb_optimizations != 0;
+       jit->has_var_info = debug_options.mdb_optimizations || MONO_CFG_PROFILE_CALL_CONTEXT (cfg);
 
        if (jit->epilogue_begin)
                   record_line_number (info, jit->epilogue_begin, header->code_size);
@@ -652,11 +653,11 @@ print_var_info (MonoDebugVarInfo *info, int idx, const char *name, const char *t
  * mono_debug_print_locals:
  *
  * Prints to stdout the information about the local variables in
- * a method (if @only_arguments is false) or about the arguments.
+ * a method (if \p only_arguments is false) or about the arguments.
  * The information includes the storage info (where the variable 
  * lives, in a register or in memory).
  * The method is found by looking up what method has been emitted at
- * the instruction address @ip.
+ * the instruction address \p ip.
  * This is for use inside a debugger.
  */
 void