2007-09-19 Martin Baulig <martin@ximian.com>

* mini.c (mini_cleanup): Move mono_debug_cleanup() down a little bit further, until after mono_cleanup(); call mono_debugger_cleanup() just before destroying the global code manager. svn path=/trunk/mono/; revision=85994
baulig · Sep 19, 2007 · 9abb28d · 9abb28d
1 parent 9d2dd0e
commit 9abb28d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-19  Martin Baulig  <martin@ximian.com>
+
+	* mono-debug.c (mono_debug_cleanup): Don't call
+	mono_debugger_cleanup(); this is now called earlier from mini_cleanup().
+
 2007-09-19  Raja R Harinath  <harinath@gmail.com>
 
 	Fix crash on 'make run-test' in mcs/errors

diff --git a/mono/metadata/mono-debug.c b/mono/metadata/mono-debug.c
@@ -255,8 +255,6 @@ mono_debug_using_mono_debugger (void)
 void
 mono_debug_cleanup (void)
 {
-	mono_debugger_cleanup ();
-
 	if (mono_debug_handles)
 		g_hash_table_destroy (mono_debug_handles);
 	mono_debug_handles = NULL;

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-19  Martin Baulig  <martin@ximian.com>
+
+	* mini.c (mini_cleanup): Move mono_debug_cleanup() down a little
+	bit further, until after mono_cleanup(); call mono_debugger_cleanup()
+	just before destroying the global code manager.
+
 2007-09-18  Zoltan Varga  <vargaz@gmail.com>
 
 	* driver.c (mono_main): Fix a warning.

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
@@ -12286,7 +12286,7 @@ mini_cleanup (MonoDomain *domain)
 
 	mono_domain_free (domain, TRUE);
 
-	mono_debug_cleanup ();
+	mono_debugger_cleanup ();
 
 	mono_code_manager_destroy (global_codeman);
 	g_hash_table_destroy (jit_icall_name_hash);
@@ -12300,6 +12300,8 @@ mini_cleanup (MonoDomain *domain)
 
 	mono_trace_cleanup ();
 
+	mono_debug_cleanup ();
+
 	mono_counters_dump (-1, stdout);
 
 	if (mono_inject_async_exc_method)