test_op_il_seq_point.sh now properly tests AOT compilation.

[mono.git] / mono / metadata / remoting.c

diff --git a/mono/metadata/remoting.c b/mono/metadata/remoting.c
index df77ff89fd9e4742a8a8d6c3cf3a4789bc368330..92e6970b05bf03f0d4cb70742a43b76cf4ac4fb7 100644 (file)
--- a/mono/metadata/remoting.c
+++ b/mono/metadata/remoting.c
@@ -165,6 +165,8 @@ mono_remoting_marshal_init (void)
        klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Contexts", "Context");
        method_needs_context_sink = mono_class_get_method_from_name (klass, "get_NeedsContextSink", -1);
 
+       mono_loader_lock ();
+
        register_icall (type_from_handle, "type_from_handle", "object ptr", FALSE);
        register_icall (mono_marshal_set_domain_by_id, "mono_marshal_set_domain_by_id", "int32 int32 int32", FALSE);
        register_icall (mono_marshal_check_domain_image, "mono_marshal_check_domain_image", "int32 int32 ptr", FALSE);
@@ -173,6 +175,8 @@ mono_remoting_marshal_init (void)
        register_icall (mono_remoting_wrapper, "mono_remoting_wrapper", "object ptr ptr", FALSE);
        register_icall (mono_upgrade_remote_class_wrapper, "mono_upgrade_remote_class_wrapper", "void object object", FALSE);
 
+       mono_loader_unlock ();
+
        module_initialized = TRUE;
 }