2004-07-05 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mono/metadata/mono-debug.c b/mono/metadata/mono-debug.c
index 3b8cd558101aa99d875f39802b493cfccc9fb737..b8503ecbc4be7be428935b57fb52d1f1e03bca25 100644 (file)
--- a/mono/metadata/mono-debug.c
+++ b/mono/metadata/mono-debug.c
@@ -234,8 +234,9 @@ mono_debug_add_wrapper (MonoMethod *method, MonoMethod *wrapper_method, MonoDoma
 
        domain_data = mono_debug_get_domain_data (handle, domain);
        if (domain_data->jit [minfo->index]) {
-               // FIXME FIXME FIXME
+               /* FIXME FIXME FIXME
                // This is bug #48591.
+               */
                return;
        }
 
@@ -265,28 +266,35 @@ mono_debug_add_method (MonoMethod *method, MonoDebugMethodJitInfo *jit, MonoDoma
        MonoDebugHandle *handle;
        MonoDebugMethodInfo *minfo;
 
+       mono_debugger_lock ();
+
        mono_class_init (klass);
 
        if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
            (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
            (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
-           (method->flags & METHOD_ATTRIBUTE_ABSTRACT))
+           (method->flags & METHOD_ATTRIBUTE_ABSTRACT)) {
+               mono_debugger_unlock ();
                return;
+       }
 
        handle = _mono_debug_get_image (klass->image);
-       if (!handle)
+       if (!handle) {
+               mono_debugger_unlock ();
                return;
+       }
 
        minfo = _mono_debug_lookup_method (method);
-       if (!minfo)
+       if (!minfo) {
+               mono_debugger_unlock ();
                return;
-
-       mono_debugger_lock ();
+       }
 
        domain_data = mono_debug_get_domain_data (handle, domain);
        if (domain_data->jit [minfo->index]) {
-               // FIXME FIXME FIXME
+               /* FIXME FIXME FIXME
                // This is bug #48591.
+               */
                mono_debugger_unlock ();
                return;
        }