Merge pull request #2948 from ludovic-henry/coop-n2m-eh-callback

[mono.git] / mono / mini / mini-runtime.c

diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index 40163d01d7ffbb2c46cf1383b55c84352b22ff37..71c9e6bcceee9e21b165f6acdd16cb613f6beba3 100644 (file)
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -951,7 +951,7 @@ mono_jit_thread_attach (MonoDomain *domain, gpointer *dummy)
 
                        /* mono_threads_reset_blocking_start returns the current MonoThreadInfo
                         * if we were in BLOCKING mode */
-                       return mono_thread_info_current ();
+                       return mono_threads_cookie_for_reset_blocking_start (mono_thread_info_current (), 1);
                } else {
                        orig = mono_domain_get ();
 
@@ -4051,7 +4051,7 @@ register_icalls (void)
        register_icall (mono_helper_stelem_ref_check, "mono_helper_stelem_ref_check", "void object object", FALSE);
        register_icall (ves_icall_object_new, "ves_icall_object_new", "object ptr ptr", FALSE);
        register_icall (ves_icall_object_new_specific, "ves_icall_object_new_specific", "object ptr", FALSE);
-       register_icall (mono_array_new, "mono_array_new", "object ptr ptr int32", FALSE);
+       register_icall (ves_icall_array_new, "ves_icall_array_new", "object ptr ptr int32", FALSE);
        register_icall (ves_icall_array_new_specific, "ves_icall_array_new_specific", "object ptr int32", FALSE);
        register_icall (ves_icall_runtime_class_init, "ves_icall_runtime_class_init", "void ptr", FALSE);
        register_icall (mono_ldftn, "mono_ldftn", "ptr ptr", FALSE);