Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / lldb.c

diff --git a/mono/mini/lldb.c b/mono/mini/lldb.c
index 8f16e1757a5d2c82c9d1e7f93368b5e219dbe451..3e44b35bf6e86e3c2c20e018fdf0bbba828361c4 100644 (file)
--- a/mono/mini/lldb.c
+++ b/mono/mini/lldb.c
@@ -1,5 +1,6 @@
-/*
- * lldb.c: Mono support for LLDB.
+/**
+ * \file
+ * Mono support for LLDB.
  *
  * Author:
  *   Zoltan Varga (vargaz@gmail.com)
@@ -12,9 +13,7 @@
 #include "lldb.h"
 #include "seq-points.h"
 
-#include <mono/metadata/mono-debug.h>
-#include <mono/metadata/mono-debug-debugger.h>
-#include <mono/metadata/debug-mono-symfile.h>
+#include <mono/metadata/debug-internals.h>
 #include <mono/utils/mono-counters.h>
 
 #if !defined(DISABLE_JIT) && !defined(DISABLE_LLDB)
@@ -120,7 +119,7 @@ static GHashTable *codegen_regions;
 static DebugEntry *last_entry;
 static mono_mutex_t mutex;
 static GHashTable *dyn_codegen_regions;
-static double register_time;
+static gdouble register_time;
 static int num_entries;
 
 #define lldb_lock() mono_os_mutex_lock (&mutex)
@@ -596,7 +595,9 @@ mono_lldb_save_trampoline_info (MonoTrampInfo *info)
        mono_global_codeman_foreach (find_code_region, &udata);
        if (!udata.found)
                mono_domain_code_foreach (mono_get_root_domain (), find_code_region, &udata);
-       g_assert (udata.found);
+       if (!udata.found)
+               /* Can happen with AOT */
+               return;
 
        region_id = register_codegen_region (udata.region_start, udata.region_size, FALSE);