Author: zoltan
Date: 2005-03-04 08:06:05 -0500 (Fri, 04 Mar 2005)
New Revision: 41436

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-exceptions.c
Log:
2005-03-04  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-exceptions.c (ves_icall_get_trace): Return wrapper info as well.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2005-03-04 13:03:43 UTC (rev 41435)
+++ trunk/mono/mono/mini/ChangeLog      2005-03-04 13:06:05 UTC (rev 41436)
@@ -1,3 +1,7 @@
+2005-03-04  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * mini-exceptions.c (ves_icall_get_trace): Return wrapper info as well.
+
 2005-03-03  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * mini.h mini.c mini-x86.c: Pass the domain of the native->managed

Modified: trunk/mono/mono/mini/mini-exceptions.c
===================================================================
--- trunk/mono/mono/mini/mini-exceptions.c      2005-03-04 13:03:43 UTC (rev 
41435)
+++ trunk/mono/mono/mini/mini-exceptions.c      2005-03-04 13:06:05 UTC (rev 
41436)
@@ -193,7 +193,16 @@
 
                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);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to