Mon Mar 22 16:03:34 CET 2010 Paolo Molaro <lupus@ximian.com>

	* mono-debug.c: don't try to get the emthod ehader, it causes a
	deadlock and it is not used for anything anymore.

svn path=/trunk/mono/; revision=153983

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index a2baa61e16c256d7eb452d1f0e030026ed1a133d..b2486d4a0a9ccf484e940b107c6a4ac67ca633ea 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon Mar 22 16:03:34 CET 2010 Paolo Molaro <lupus@ximian.com>
+
+       * mono-debug.c: don't try to get the emthod ehader, it causes a
+       deadlock and it is not used for anything anymore.
+
 2010-03-22  Zoltan Varga  <vargaz@gmail.com>
 
        * loader.c (mono_method_get_marshal_info): Fix the handling of dynamic methods

diff --git a/mono/metadata/mono-debug.c b/mono/metadata/mono-debug.c
index 7ad15bbabcff6eee2bdc17b4c969d4efc59e2b18..a1767f01076066a3011837438d5b5032d185ff2a 100644 (file)
--- a/mono/metadata/mono-debug.c
+++ b/mono/metadata/mono-debug.c
@@ -653,20 +653,13 @@ mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDoma
                g_hash_table_insert (table->method_hash, declaring, header);
 
                if (is_wrapper) {
-                       const unsigned char* il_code;
-                       MonoMethodHeader *mheader;
                        MonoDebugWrapperData *wrapper;
-                       guint32 il_codesize;
-
-                       mheader = mono_method_get_header (declaring);
-                       il_code = mono_method_header_get_code (mheader, &il_codesize, NULL);
 
                        header->wrapper_data = wrapper = g_new0 (MonoDebugWrapperData, 1);
 
                        wrapper->wrapper_type = method->wrapper_type;
                        wrapper->method_name = mono_method_full_name (declaring, TRUE);
                        wrapper->obsolete_cil_code = "";
-                       mono_metadata_free_mh (mheader);
                }
        } else {
                address->header.wrapper_data = header->wrapper_data;