Standardized Mainsoft ConstraintCollection tests.
[mono.git] / mono / mini / mini-exceptions.c
index ce350f6fcd68f4b3380b04eb694b9497e6ebf585..36946b60f45c45fedbbdd907abfff0e66c6cf9d1 100644 (file)
 #include <mono/metadata/exception.h>
 #include <mono/metadata/gc-internal.h>
 #include <mono/metadata/mono-debug.h>
+#include <mono/metadata/mono-debug-debugger.h>
 
 #include "mini.h"
 
 #define IS_ON_SIGALTSTACK(jit_tls) ((jit_tls) && ((guint8*)&(jit_tls) > (guint8*)(jit_tls)->signal_stack) && ((guint8*)&(jit_tls) < ((guint8*)(jit_tls)->signal_stack + (jit_tls)->signal_stack_size)))
 
+#ifndef mono_find_jit_info
+
 /* mono_find_jit_info:
  *
  * This function is used to gather information from @ctx. It return the 
@@ -58,23 +61,27 @@ mono_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *re
 
        if (managed2 || ji->method->wrapper_type) {
                char *source_location, *tmpaddr, *fname;
-               gint32 address, iloffset;
+               gint32 offset, iloffset;
 
-               address = (char *)ip - (char *)ji->code_start;
+               if (!managed2)
+                       /* ctx->ip points into native code */
+                       offset = (char*)MONO_CONTEXT_GET_IP (new_ctx) - (char*)ji->code_start;
+               else
+                       offset = (char *)ip - (char *)ji->code_start;
 
                if (native_offset)
-                       *native_offset = address;
+                       *native_offset = offset;
 
                if (managed)
                        if (!ji->method->wrapper_type)
                                *managed = TRUE;
 
                if (trace) {
-                       source_location = mono_debug_source_location_from_address (ji->method, address, NULL, domain);
-                       iloffset = mono_debug_il_offset_from_address (ji->method, address, domain);
+                       source_location = mono_debug_source_location_from_address (ji->method, offset, NULL, domain);
+                       iloffset = mono_debug_il_offset_from_address (ji->method, offset, domain);
 
                        if (iloffset < 0)
-                               tmpaddr = g_strdup_printf ("<0x%05x>", address);
+                               tmpaddr = g_strdup_printf ("<0x%05x>", offset);
                        else
                                tmpaddr = g_strdup_printf ("[0x%05x]", iloffset);
                
@@ -101,6 +108,64 @@ mono_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *re
        return ji;
 }
 
+#endif /* mono_find_jit_info */
+
+MonoString *
+ves_icall_System_Exception_get_trace (MonoException *ex)
+{
+       MonoDomain *domain = mono_domain_get ();
+       MonoString *res;
+       MonoArray *ta = ex->trace_ips;
+       int i, len;
+       GString *trace_str;
+       char tmpaddr [256];
+
+       if (ta == NULL)
+               /* Exception is not thrown yet */
+               return NULL;
+
+       len = mono_array_length (ta);
+       trace_str = g_string_new ("");
+       for (i = 0; i < len; i++) {
+               MonoJitInfo *ji;
+               gpointer ip = mono_array_get (ta, gpointer, i);
+
+               ji = mono_jit_info_table_find (domain, ip);
+               if (ji == NULL) {
+                       /* Unmanaged frame */
+                       g_string_append_printf (trace_str, "in (unmanaged) %p\n", ip);
+               } else {
+                       char *source_location, *fname;
+                       gint32 address, iloffset;
+
+                       address = (char *)ip - (char *)ji->code_start;
+
+                       source_location = mono_debug_source_location_from_address (ji->method, address, NULL, ex->object.vtable->domain);
+                       iloffset = mono_debug_il_offset_from_address (ji->method, address, ex->object.vtable->domain);
+
+                       if (iloffset < 0)
+                               sprintf (tmpaddr, "<0x%05x>", address);
+                       else
+                               sprintf (tmpaddr, "[0x%05x]", iloffset);
+               
+                       fname = mono_method_full_name (ji->method, TRUE);
+
+                       if (source_location)
+                               g_string_append_printf (trace_str, "in %s (at %s) %s\n", tmpaddr, source_location, fname);
+                       else
+                               g_string_append_printf (trace_str, "in %s %s\n", tmpaddr, fname);
+
+                       g_free (fname);
+                       g_free (source_location);
+               }
+       }
+
+       res = mono_string_new (ex->object.vtable->domain, trace_str->str);
+       g_string_free (trace_str, TRUE);
+
+       return res;
+}
+
 MonoArray *
 ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info)
 {
@@ -132,7 +197,16 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
 
                g_assert (ji != NULL);
 
-               sf->method = mono_method_get_object (domain, ji->method, NULL);
+               if (ji->method->wrapper_type) {
+                       char *s;
+
+                       sf->method = NULL;
+                       s = mono_method_full_name (ji->method, TRUE);
+                       sf->internal_method_name = mono_string_new (domain, s);
+                       g_free (s);
+               }
+               else
+                       sf->method = mono_method_get_object (domain, ji->method, NULL);
                sf->native_offset = (char *)ip - (char *)ji->code_start;
 
                sf->il_offset = mono_debug_il_offset_from_address (ji->method, sf->native_offset, domain);
@@ -154,6 +228,50 @@ ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info
        return res;
 }
 
+/**
+ * mono_walk_stack:
+ * @domain: starting appdomain
+ * @jit_tls: JIT data for the thread
+ * @start_ctx: starting state of the stack frame
+ * @func: callback to call for each stack frame
+ * @user_data: data passed to the callback
+ *
+ * This function walks the stack of a thread, starting from the state
+ * represented by jit_tls and start_ctx. For each frame the callback
+ * function is called with the relevant info. The walk ends when no more
+ * managed stack frames are found or when the callback returns a TRUE value.
+ * Note that the function can be used to walk the stack of a thread 
+ * different from the current.
+ */
+void
+mono_walk_stack (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoContext *start_ctx, MonoStackFrameWalk func, gpointer user_data)
+{
+       MonoLMF *lmf = jit_tls->lmf;
+       MonoJitInfo *ji, rji;
+       gint native_offset;
+       gboolean managed;
+       MonoContext ctx, new_ctx;
+
+       ctx = *start_ctx;
+
+       while (MONO_CONTEXT_GET_BP (&ctx) < jit_tls->end_of_stack) {
+               /* 
+                * FIXME: mono_find_jit_info () will need to be able to return a different
+                * MonoDomain when apddomain transitions are found on the stack.
+                */
+               ji = mono_find_jit_info (domain, jit_tls, &rji, NULL, &ctx, &new_ctx, NULL, &lmf, &native_offset, &managed);
+               if (!ji || ji == (gpointer)-1)
+                       return;
+
+               if (func (domain, &new_ctx, ji, user_data))
+                       return;
+
+               ctx = new_ctx;
+       }
+}
+
+#ifndef CUSTOM_STACK_WALK
+
 void
 mono_jit_walk_stack (MonoStackWalk func, gboolean do_il_offset, gpointer user_data) {
        MonoDomain *domain = mono_domain_get ();
@@ -165,11 +283,20 @@ mono_jit_walk_stack (MonoStackWalk func, gboolean do_il_offset, gpointer user_da
 
        MonoContext ctx, new_ctx;
 
+#ifdef _MSC_VER
+       unsigned int stackptr, retaddr;
+       __asm mov stackptr, ebp;
+       __asm mov eax, DWORD PTR [ebp + 4];
+       __asm mov retaddr, eax;
+       MONO_CONTEXT_SET_IP (&ctx, retaddr);
+       /* FIXME: NOT WORKING -- THIS IS __builtin_frame_address (0) NOT (1) */
+       MONO_CONTEXT_SET_BP (&ctx, stackptr);
+#else
        mono_arch_flush_register_windows ();
 
        MONO_CONTEXT_SET_IP (&ctx, __builtin_return_address (0));
        MONO_CONTEXT_SET_BP (&ctx, __builtin_frame_address (1));
-
+#endif
        while (MONO_CONTEXT_GET_BP (&ctx) < jit_tls->end_of_stack) {
                
                ji = mono_find_jit_info (domain, jit_tls, &rji, NULL, &ctx, &new_ctx, NULL, &lmf, &native_offset, &managed);
@@ -198,11 +325,18 @@ ves_icall_get_frame_info (gint32 skip, MonoBoolean need_file_info,
        MonoLMF *lmf = jit_tls->lmf;
        MonoJitInfo *ji, rji;
        MonoContext ctx, new_ctx;
+       gssize stackptr;
 
        mono_arch_flush_register_windows ();
 
+#ifdef _MSC_VER
+       __asm mov stackptr, ebp;
+#else
+       stackptr = (gssize)__builtin_frame_address (0);
+#endif
+
        MONO_CONTEXT_SET_IP (&ctx, ves_icall_get_frame_info);
-       MONO_CONTEXT_SET_BP (&ctx, __builtin_frame_address (0));
+       MONO_CONTEXT_SET_BP (&ctx, stackptr);
 
        skip++;
 
@@ -243,8 +377,126 @@ ves_icall_get_frame_info (gint32 skip, MonoBoolean need_file_info,
        return TRUE;
 }
 
+#endif /* CUSTOM_STACK_WALK */
+
+typedef struct {
+       guint32 skips;
+       MonoSecurityFrame *frame;
+} MonoFrameSecurityInfo;
+
+static gboolean
+callback_get_first_frame_security_info (MonoDomain *domain, MonoContext *ctx, MonoJitInfo *ji, gpointer data)
+{
+       MonoFrameSecurityInfo *si = (MonoFrameSecurityInfo*) data;
+
+       /* FIXME: skip all wrappers ?? probably not - case by case testing is required */
+       if (ji->method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE ||
+           ji->method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE ||
+           ji->method->wrapper_type == MONO_WRAPPER_XDOMAIN_DISPATCH ||
+           ji->method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK ||
+           ji->method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE) {
+               return FALSE;
+       }
+
+       if (si->skips > 0) {
+               si->skips--;
+               return FALSE;
+       }
+
+       si->frame = mono_declsec_create_frame (domain, ji);
+
+       /* Stop - we only want the first frame (e.g. LinkDemand and InheritanceDemand) */
+       return TRUE;
+}
+
+/**
+ * ves_icall_System_Security_SecurityFrame_GetSecurityFrame:
+ * @skip: the number of stack frames to skip
+ *
+ * This function returns a the security informations of a single stack frame 
+ * (after the skipped ones). This is required for [NonCas]LinkDemand[Choice]
+ * and [NonCas]InheritanceDemand[Choice] as only the caller security is 
+ * evaluated.
+ */
+MonoSecurityFrame*
+ves_icall_System_Security_SecurityFrame_GetSecurityFrame (gint32 skip)
+{
+       MonoDomain *domain = mono_domain_get ();
+       MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+       MonoFrameSecurityInfo si;
+       MonoContext ctx;
+
+#ifdef _MSC_VER
+       /* seems that MSC doesn't like having __asm in macros */
+       unsigned int stackptr;
+       mono_arch_flush_register_windows ();
+       __asm mov stackptr, ebp;
+       MONO_CONTEXT_SET_IP (&ctx, ves_icall_System_Security_SecurityFrame_GetSecurityFrame);
+       MONO_CONTEXT_SET_BP (&ctx, stackptr);
+#else
+       MONO_INIT_CONTEXT_FROM_FUNC (&ctx, ves_icall_System_Security_SecurityFrame_GetSecurityFrame);
+#endif
+
+       si.skips = skip;
+       si.frame = NULL;
+       mono_walk_stack (domain, jit_tls, &ctx, callback_get_first_frame_security_info, (gpointer)&si);
+
+       return (si.skips == 0) ? si.frame : NULL;
+}
+
+
+typedef struct {
+       guint32 skips;
+       MonoArray *stack;
+       guint32 count;
+       guint32 maximum;
+} MonoSecurityStack;
+
+static void
+grow_array (MonoSecurityStack *stack)
+{
+       MonoDomain *domain = mono_domain_get ();
+       guint32 newsize = (stack->maximum << 1);
+       MonoArray *newstack = mono_array_new (domain, mono_defaults.runtimesecurityframe_class, newsize);
+       int i;
+       for (i=0; i < stack->maximum; i++) {
+               gpointer frame = mono_array_get (stack->stack, gpointer, i);
+               mono_array_set (newstack, gpointer, i, frame);
+       }
+       stack->maximum = newsize;
+       stack->stack = newstack;
+}
+
+static gboolean
+callback_get_stack_frames_security_info (MonoDomain *domain, MonoContext *ctx, MonoJitInfo *ji, gpointer data)
+{
+       MonoSecurityStack *ss = (MonoSecurityStack*) data;
+
+       /* FIXME: skip all wrappers ?? probably not - case by case testing is required */
+       if (ji->method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE ||
+           ji->method->wrapper_type == MONO_WRAPPER_XDOMAIN_INVOKE ||
+           ji->method->wrapper_type == MONO_WRAPPER_XDOMAIN_DISPATCH ||
+           ji->method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK ||
+           ji->method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE) {
+               return FALSE;
+       }
+
+       if (ss->skips > 0) {
+               ss->skips--;
+               return FALSE;
+       }
+
+       if (ss->count == ss->maximum)
+               grow_array (ss);
+       
+       mono_array_set (ss->stack, gpointer, ss->count++, mono_declsec_create_frame (domain, ji));
+
+       /* continue down the stack */
+       return FALSE;
+}
+
 static MonoArray *
-glist_to_array (GList *list) 
+glist_to_array (GList *list, MonoClass *eclass
 {
        MonoDomain *domain = mono_domain_get ();
        MonoArray *res;
@@ -254,7 +506,7 @@ glist_to_array (GList *list)
                return NULL;
 
        len = g_list_length (list);
-       res = mono_array_new (domain, mono_defaults.int_class, len);
+       res = mono_array_new (domain, eclass, len);
 
        for (i = 0; list; list = list->next, i++)
                mono_array_set (res, gpointer, i, list->data);
@@ -262,6 +514,45 @@ glist_to_array (GList *list)
        return res;
 }
 
+/**
+ * ves_icall_System_Security_SecurityFrame_GetSecurityStack:
+ * @skip: the number of stack frames to skip
+ *
+ * This function returns an managed array of containing the security
+ * informations for each frame (after the skipped ones). This is used for
+ * [NonCas]Demand[Choice] where the complete evaluation of the stack is 
+ * required.
+ */
+MonoArray*
+ves_icall_System_Security_SecurityFrame_GetSecurityStack (gint32 skip)
+{
+       MonoDomain *domain = mono_domain_get ();
+       MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+       MonoSecurityStack ss;
+       MonoContext ctx;
+
+#ifdef _MSC_VER
+       /* seems that MSC doesn't like having __asm in macros */
+       unsigned int stackptr;
+       mono_arch_flush_register_windows ();
+       __asm mov stackptr, ebp;
+       MONO_CONTEXT_SET_IP (&ctx, ves_icall_System_Security_SecurityFrame_GetSecurityStack);
+       MONO_CONTEXT_SET_BP (&ctx, stackptr);
+#else
+       MONO_INIT_CONTEXT_FROM_FUNC (&ctx, ves_icall_System_Security_SecurityFrame_GetSecurityStack);
+#endif
+
+       ss.skips = skip;
+       ss.count = 0;
+       ss.maximum = MONO_CAS_INITIAL_STACK_SIZE;
+       ss.stack = mono_array_new (domain, mono_defaults.runtimesecurityframe_class, ss.maximum);
+       mono_walk_stack (domain, jit_tls, &ctx, callback_get_stack_frames_security_info, (gpointer)&ss);
+       /* g_warning ("STACK RESULT: %d out of %d", ss.count, ss.maximum); */
+       return ss.stack;
+}
+
+#ifndef CUSTOM_EXCEPTION_HANDLING
+
 /**
  * mono_handle_exception:
  * @ctx: saved processor state
@@ -278,14 +569,14 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
        static void (*restore_context) (void *);
        MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
        MonoLMF *lmf = jit_tls->lmf;            
+       MonoArray *initial_trace_ips = NULL;
        GList *trace_ips = NULL;
        MonoException *mono_ex;
        gboolean stack_overflow = FALSE;
        MonoContext initial_ctx;
        int frame_count = 0;
        gboolean gc_disabled = FALSE;
-       MonoString *initial_stack_trace = NULL;
-       GString *trace_str = NULL;
+       gboolean has_dynamic_methods = FALSE;
        
        /*
         * This function might execute on an alternate signal stack, and Boehm GC
@@ -317,6 +608,7 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
         */
        if (obj == domain->stack_overflow_ex) {
                obj = mono_get_exception_stack_overflow ();
+               stack_overflow = TRUE;
        }
        else if (obj == domain->null_reference_ex) {
                obj = mono_get_exception_null_reference ();
@@ -324,14 +616,11 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
 
        if (mono_object_isinst (obj, mono_defaults.exception_class)) {
                mono_ex = (MonoException*)obj;
-               initial_stack_trace = mono_ex->stack_trace;
+               initial_trace_ips = mono_ex->trace_ips;
        } else {
                mono_ex = NULL;
        }
 
-       if (obj == domain->stack_overflow_ex)
-               stack_overflow = TRUE;
-
        if (!call_filter)
                call_filter = mono_arch_get_call_filter ();
 
@@ -370,18 +659,10 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
 
        while (1) {
                MonoContext new_ctx;
-               char *trace = NULL;
-               gboolean need_trace = FALSE;
                guint32 free_stack;
 
-               if (test_only && (frame_count < 1000)) {
-                       need_trace = TRUE;
-                       if (!trace_str)
-                               trace_str = g_string_new ("");
-               }
-
                ji = mono_find_jit_info (domain, jit_tls, &rji, &rji, ctx, &new_ctx, 
-                                                                need_trace ? &trace : NULL, &lmf, NULL, NULL);
+                                                                NULL, &lmf, NULL, NULL);
                if (!ji) {
                        g_warning ("Exception inside function without unwind info");
                        g_assert_not_reached ();
@@ -397,14 +678,14 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
                                 * rethrown. Also avoid giant stack traces during a stack
                                 * overflow.
                                 */
-                               if (!initial_stack_trace && (frame_count < 1000)) {
+                               if (!initial_trace_ips && (frame_count < 1000)) {
                                        trace_ips = g_list_prepend (trace_ips, MONO_CONTEXT_GET_IP (ctx));
-
-                                       g_string_append (trace_str, trace);
-                                       g_string_append_c (trace_str, '\n');
                                }
                        }
 
+                       if (ji->method->dynamic)
+                               has_dynamic_methods = TRUE;
+
                        if (stack_overflow)
                                free_stack = (guint8*)(MONO_CONTEXT_GET_BP (ctx)) - (guint8*)(MONO_CONTEXT_GET_BP (&initial_ctx));
                        else
@@ -417,23 +698,22 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
                        if ((free_stack > (64 * 1024)) && ji->num_clauses) {
                                int i;
                                
-                               g_assert (ji->clauses);
-                       
                                for (i = 0; i < ji->num_clauses; i++) {
                                        MonoJitExceptionInfo *ei = &ji->clauses [i];
                                        gboolean filtered = FALSE;
 
+#ifdef __s390__
+                                       if (ei->try_start < MONO_CONTEXT_GET_IP (ctx) && 
+#else
                                        if (ei->try_start <= MONO_CONTEXT_GET_IP (ctx) && 
+#endif
                                            MONO_CONTEXT_GET_IP (ctx) <= ei->try_end) { 
                                                /* catch block */
 
                                                if ((ei->flags == MONO_EXCEPTION_CLAUSE_NONE) || (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER)) {
-                                                       /* store the exception object int cfg->excvar */
-                                                       g_assert (ji->exvar_offset);
-                                                       *((gpointer *)((char *)MONO_CONTEXT_GET_BP (ctx) + ji->exvar_offset)) = obj;
-                                                       if (!initial_stack_trace && trace_str) {
-                                                               mono_ex->stack_trace = mono_string_new (domain, trace_str->str);
-                                                       }
+                                                       /* store the exception object in cfg->excvar */
+                                                       g_assert (ei->exvar_offset);
+                                                       *((gpointer *)((char *)MONO_CONTEXT_GET_BP (ctx) + ei->exvar_offset)) = obj;
                                                }
 
                                                if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
@@ -444,17 +724,17 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
                                                if ((ei->flags == MONO_EXCEPTION_CLAUSE_NONE && 
                                                     mono_object_isinst (obj, ei->data.catch_class)) || filtered) {
                                                        if (test_only) {
-                                                               if (mono_ex) {
+                                                               if (mono_ex && !initial_trace_ips) {
                                                                        trace_ips = g_list_reverse (trace_ips);
-                                                                       mono_ex->trace_ips = glist_to_array (trace_ips);
+                                                                       mono_ex->trace_ips = glist_to_array (trace_ips, mono_defaults.int_class);
+                                                                       if (has_dynamic_methods)
+                                                                               /* These methods could go away anytime, so compute the stack trace now */
+                                                                               mono_ex->stack_trace = ves_icall_System_Exception_get_trace (mono_ex);
                                                                }
                                                                g_list_free (trace_ips);
-                                                               g_free (trace);
 
                                                                if (gc_disabled)
                                                                        mono_gc_enable ();
-                                                               if (trace_str)
-                                                                       g_string_free (trace_str, TRUE);
                                                                return TRUE;
                                                        }
                                                        if (mono_jit_trace_calls != NULL && mono_trace_eval (ji->method))
@@ -462,12 +742,9 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
                                                        mono_debugger_handle_exception (ei->handler_start, MONO_CONTEXT_GET_SP (ctx), obj);
                                                        MONO_CONTEXT_SET_IP (ctx, ei->handler_start);
                                                        jit_tls->lmf = lmf;
-                                                       g_free (trace);
 
                                                        if (gc_disabled)
                                                                mono_gc_enable ();
-                                                       if (trace_str)
-                                                               g_string_free (trace_str, TRUE);
                                                        return 0;
                                                }
                                                if (!test_only && ei->try_start <= MONO_CONTEXT_GET_IP (ctx) && 
@@ -484,8 +761,6 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
                        }
                }
 
-               g_free (trace);
-                       
                *ctx = new_ctx;
 
                if ((ji == (gpointer)-1) || MONO_CONTEXT_GET_BP (ctx) >= jit_tls->end_of_stack) {
@@ -499,21 +774,22 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
                                        /* Switch back to normal stack */
                                        if (stack_overflow)
                                                /* Free up some stack space */
-                                               MONO_CONTEXT_SET_SP (&initial_ctx, (guint32)(MONO_CONTEXT_GET_SP (&initial_ctx)) + (64 * 1024));
-                                       MONO_CONTEXT_SET_IP (&initial_ctx, (unsigned int)jit_tls->abort_func);
+                                               MONO_CONTEXT_SET_SP (&initial_ctx, (gssize)(MONO_CONTEXT_GET_SP (&initial_ctx)) + (64 * 1024));
+                                       MONO_CONTEXT_SET_IP (&initial_ctx, (gssize)jit_tls->abort_func);
                                        restore_context (&initial_ctx);
                                }
                                else
                                        jit_tls->abort_func (obj);
                                g_assert_not_reached ();
                        } else {
-                               if (mono_ex) {
+                               if (mono_ex && !initial_trace_ips) {
                                        trace_ips = g_list_reverse (trace_ips);
-                                       mono_ex->trace_ips = glist_to_array (trace_ips);
+                                       mono_ex->trace_ips = glist_to_array (trace_ips, mono_defaults.int_class);
+                                       if (has_dynamic_methods)
+                                               /* These methods could go away anytime, so compute the stack trace now */
+                                               mono_ex->stack_trace = ves_icall_System_Exception_get_trace (mono_ex);
                                }
                                g_list_free (trace_ips);
-                               if (trace_str)
-                                       g_string_free (trace_str, TRUE);
                                return FALSE;
                        }
                }
@@ -521,3 +797,5 @@ mono_handle_exception (MonoContext *ctx, gpointer obj, gpointer original_ip, gbo
 
        g_assert_not_reached ();
 }
+#endif /* CUSTOM_EXECPTION_HANDLING */
+