Merge pull request #1991 from esdrubal/seq_test_fix

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

diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index b5c07ef9a44dc482b947a52009d0b808c2e553e5..8b454087638bef15f630ffa4446e8e57391fc72f 100644 (file)
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -616,10 +616,6 @@ mono_icall_get_wrapper_full (MonoJitICallInfo* callinfo, gboolean do_compile)
                /* This icall is used to check for exceptions, so don't check in the wrapper */
                check_exc = FALSE;
 
-       if (!strcmp (callinfo->name, "mono_threads_state_poll"))
-               /* Checking exceptions could lead to infinite recursion with mono_thread_interruption_checkpoint () */
-               check_exc = FALSE;
-
        name = g_strdup_printf ("__icall_wrapper_%s", callinfo->name);
        wrapper = mono_marshal_get_icall_wrapper (callinfo->sig, name, callinfo->func, check_exc);
        g_free (name);
@@ -2662,6 +2658,8 @@ mini_parse_debug_options (void)
                        debug_options.gen_sdb_seq_points = TRUE;
                else if (!strcmp (arg, "gen-compact-seq-points"))
                        debug_options.gen_seq_points_compact_data = TRUE;
+               else if (!strcmp (arg, "single-imm-size"))
+                       debug_options.single_imm_size = TRUE;
                else if (!strcmp (arg, "init-stacks"))
                        debug_options.init_stacks = TRUE;
                else if (!strcmp (arg, "casts"))
@@ -3137,8 +3135,6 @@ register_icalls (void)
                                ves_icall_get_frame_info);
        mono_add_internal_call ("System.Diagnostics.StackTrace::get_trace",
                                ves_icall_get_trace);
-       mono_add_internal_call ("System.Exception::get_trace",
-                               ves_icall_System_Exception_get_trace);
        mono_add_internal_call ("Mono.Runtime::mono_runtime_install_handlers",
                                mono_runtime_install_handlers);