return ji;
}
+static gpointer
+get_generic_info_from_stack_frame (MonoJitInfo *ji, MonoContext *ctx)
+{
+ MonoGenericJitInfo *gi;
+
+ if (!ji->has_generic_jit_info)
+ return NULL;
+ gi = mono_jit_info_get_generic_jit_info (ji);
+ if (!gi->has_this)
+ return NULL;
+
+ if (gi->this_in_reg)
+ return mono_arch_context_get_int_reg (ctx, gi->this_reg);
+ else
+ return *(gpointer*)(gpointer)((char*)mono_arch_context_get_int_reg (ctx, gi->this_reg) +
+ gi->this_offset);
+}
+
+static MonoGenericContext
+get_generic_context_from_stack_frame (MonoJitInfo *ji, gpointer generic_info)
+{
+ MonoGenericContext context = { NULL, NULL };
+ MonoClass *class, *method_container_class;
+
+ g_assert (generic_info);
+
+ g_assert (ji->method->is_inflated);
+ if (mono_method_get_context (ji->method)->method_inst) {
+ MonoMethodRuntimeGenericContext *mrgctx = generic_info;
+
+ class = mrgctx->class_vtable->klass;
+ context.method_inst = mrgctx->method_inst;
+ g_assert (context.method_inst);
+ } else if ((ji->method->flags & METHOD_ATTRIBUTE_STATIC) || ji->method->klass->valuetype) {
+ MonoVTable *vtable = generic_info;
+
+ class = vtable->klass;
+ } else {
+ MonoObject *this = generic_info;
+
+ class = this->vtable->klass;
+ }
+
+ if (class->generic_class || class->generic_container)
+ context.class_inst = mini_class_get_context (class)->class_inst;
+
+ g_assert (!ji->method->klass->generic_container);
+ if (ji->method->klass->generic_class)
+ method_container_class = ji->method->klass->generic_class->container_class;
+ else
+ method_container_class = ji->method->klass;
+
+ if (class->generic_class)
+ g_assert (mono_class_has_parent_and_ignore_generics (class->generic_class->container_class, method_container_class));
+ else
+ g_assert (mono_class_has_parent_and_ignore_generics (class, method_container_class));
+
+ return context;
+}
+
+static MonoMethod*
+get_method_from_stack_frame (MonoJitInfo *ji, gpointer generic_info)
+{
+ MonoGenericContext context;
+ MonoMethod *method;
+
+ if (!ji->has_generic_jit_info || !mono_jit_info_get_generic_jit_info (ji)->has_this)
+ return ji->method;
+ context = get_generic_context_from_stack_frame (ji, generic_info);
+
+ method = mono_method_get_declaring_generic_method (ji->method);
+ method = mono_class_inflate_generic_method (method, &context);
+
+ return method;
+}
+
MonoString *
ves_icall_System_Exception_get_trace (MonoException *ex)
{
/* Exception is not thrown yet */
return NULL;
- len = mono_array_length (ta);
+ len = mono_array_length (ta) >> 1;
trace_str = g_string_new ("");
for (i = 0; i < len; i++) {
MonoJitInfo *ji;
- gpointer ip = mono_array_get (ta, gpointer, i);
+ gpointer ip = mono_array_get (ta, gpointer, i * 2 + 0);
+ gpointer generic_info = mono_array_get (ta, gpointer, i * 2 + 1);
ji = mono_jit_info_table_find (domain, ip);
if (ji == NULL) {
} else {
gchar *location;
gint32 address;
+ MonoMethod *method = get_method_from_stack_frame (ji, generic_info);
address = (char *)ip - (char *)ji->code_start;
location = mono_debug_print_stack_frame (
- ji->method, address, ex->object.vtable->domain);
+ method, address, ex->object.vtable->domain);
g_string_append_printf (trace_str, "%s\n", location);
g_free (location);
/* Exception is not thrown yet */
return mono_array_new (domain, mono_defaults.stack_frame_class, 0);
}
-
- len = mono_array_length (ta);
+
+ len = mono_array_length (ta) >> 1;
res = mono_array_new (domain, mono_defaults.stack_frame_class, len > skip ? len - skip : 0);
for (i = skip; i < len; i++) {
MonoJitInfo *ji;
MonoStackFrame *sf = (MonoStackFrame *)mono_object_new (domain, mono_defaults.stack_frame_class);
- gpointer ip = mono_array_get (ta, gpointer, i);
+ gpointer ip = mono_array_get (ta, gpointer, i * 2 + 0);
+ gpointer generic_info = mono_array_get (ta, gpointer, i * 2 + 1);
+ MonoMethod *method;
ji = mono_jit_info_table_find (domain, ip);
if (ji == NULL) {
g_assert (ji != NULL);
+ method = get_method_from_stack_frame (ji, generic_info);
if (ji->method->wrapper_type) {
char *s;
sf->method = NULL;
- s = mono_method_full_name (ji->method, TRUE);
+ s = mono_method_full_name (method, TRUE);
MONO_OBJECT_SETREF (sf, internal_method_name, mono_string_new (domain, s));
g_free (s);
}
else
- MONO_OBJECT_SETREF (sf, method, mono_method_get_object (domain, ji->method, NULL));
+ MONO_OBJECT_SETREF (sf, method, mono_method_get_object (domain, method, NULL));
sf->native_offset = (char *)ip - (char *)ji->code_start;
/*
MonoJitInfo *ji, rji;
MonoContext ctx, new_ctx;
MonoDebugSourceLocation *location;
- MonoMethod *last_method = NULL;
+ MonoMethod *last_method = NULL, *actual_method;
MONO_ARCH_CONTEXT_DEF;
} while (skip >= 0);
- *method = mono_method_get_object (domain, ji->method, NULL);
+ actual_method = get_method_from_stack_frame (ji, &ctx);
+
+ *method = mono_method_get_object (domain, actual_method, NULL);
location = mono_debug_lookup_source_location (ji->method, *native_offset, domain);
if (location)
get_exception_catch_class (MonoJitExceptionInfo *ei, MonoJitInfo *ji, MonoContext *ctx)
{
MonoClass *catch_class = ei->data.catch_class;
- MonoGenericJitInfo *gi;
- gpointer info;
- MonoClass *class, *method_container_class;
MonoType *inflated_type;
- MonoGenericContext context = { NULL, NULL };
+ MonoGenericContext context;
if (!catch_class)
return NULL;
- if (!ji->has_generic_jit_info)
+ if (!ji->has_generic_jit_info || !mono_jit_info_get_generic_jit_info (ji)->has_this)
return catch_class;
-
- gi = mono_jit_info_get_generic_jit_info (ji);
- if (!gi->has_this)
- return catch_class;
-
- if (gi->this_in_reg)
- info = mono_arch_context_get_int_reg (ctx, gi->this_reg);
- else
- info = *(gpointer*)(gpointer)((char*)mono_arch_context_get_int_reg (ctx, gi->this_reg) +
- gi->this_offset);
-
- g_assert (ji->method->is_inflated);
-
- if (mono_method_get_context (ji->method)->method_inst) {
- MonoMethodRuntimeGenericContext *mrgctx = info;
-
- class = mrgctx->class_vtable->klass;
- context.method_inst = mrgctx->method_inst;
- g_assert (context.method_inst);
- } else if ((ji->method->flags & METHOD_ATTRIBUTE_STATIC) || ji->method->klass->valuetype) {
- MonoVTable *vtable = info;
-
- class = vtable->klass;
- } else {
- MonoObject *this = info;
-
- class = this->vtable->klass;
- }
-
- if (class->generic_class || class->generic_container)
- context.class_inst = mini_class_get_context (class)->class_inst;
-
- g_assert (!ji->method->klass->generic_container);
- if (ji->method->klass->generic_class)
- method_container_class = ji->method->klass->generic_class->container_class;
- else
- method_container_class = ji->method->klass;
-
- if (class->generic_class)
- g_assert (mono_class_has_parent_and_ignore_generics (class->generic_class->container_class, method_container_class));
- else
- g_assert (mono_class_has_parent_and_ignore_generics (class, method_container_class));
+ context = get_generic_context_from_stack_frame (ji, get_generic_info_from_stack_frame (ji, ctx));
/* FIXME: we shouldn't inflate but instead put the
type in the rgctx and fetch it from there. It
*/
if (!initial_trace_ips && (frame_count < 1000)) {
trace_ips = g_list_prepend (trace_ips, MONO_CONTEXT_GET_IP (ctx));
+ trace_ips = g_list_prepend (trace_ips,
+ get_generic_info_from_stack_frame (ji, ctx));
}
}
--- /dev/null
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+public class Gen<T> {
+ public static void staticCrash () {
+ object o = null;
+ o.GetType ();
+ }
+
+ public void callStaticCrash () {
+ staticCrash ();
+ }
+}
+
+public class main {
+ public static void callCallStaticCrash<T> () {
+ Gen<T> gt = new Gen<T> ();
+ gt.callStaticCrash ();
+ }
+
+ public static bool test (Exception exc, Type type) {
+ StackTrace st = new StackTrace (exc);
+ for (int i = 0; i < st.FrameCount; ++i) {
+ StackFrame sf = st.GetFrame (i);
+ MethodBase m = sf.GetMethod ();
+ Type t = m.DeclaringType;
+ if (m.IsGenericMethod) {
+ Type[] margs = m.GetGenericArguments ();
+ //Console.WriteLine (m.Name);
+ if (margs.Length != 1)
+ return false;
+ if (margs [0] != type)
+ return false;
+ }
+ if (t.IsGenericType) {
+ Type[] targs = t.GetGenericArguments ();
+ //Console.WriteLine (t.FullName);
+ if (targs.Length != 1)
+ return false;
+ if (targs [0] != type)
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public static int Main () {
+ try {
+ callCallStaticCrash <int> ();
+ } catch (Exception exc) {
+ if (!test (exc, typeof (int)))
+ return 1;
+ }
+ try {
+ callCallStaticCrash <object> ();
+ } catch (Exception exc) {
+ if (!test (exc, typeof (object)))
+ return 1;
+ }
+ try {
+ callCallStaticCrash <string> ();
+ } catch (Exception exc) {
+ if (!test (exc, typeof (string)))
+ return 1;
+ }
+ try {
+ callCallStaticCrash <Gen<string>> ();
+ } catch (Exception exc) {
+ if (!test (exc, typeof (Gen<string>)))
+ return 1;
+ }
+ return 0;
+ }
+}
projects / mono.git / commitdiff