Author: miguel
Date: 2006-12-13 02:25:06 -0500 (Wed, 13 Dec 2006)
New Revision: 69438

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini.c
Log:
2006-12-13  Miguel de Icaza  <[EMAIL PROTECTED]>

        * mini.c (mono_method_to_ir): Provide useful information on this
        assert, to prevent others from debugging like I did.

Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2006-12-13 07:20:26 UTC (rev 69437)
+++ trunk/mono/mono/mini/ChangeLog      2006-12-13 07:25:06 UTC (rev 69438)
@@ -1,4 +1,8 @@
+2006-12-13  Miguel de Icaza  <[EMAIL PROTECTED]>
 
+       * mini.c (mono_method_to_ir): Provide useful information on this
+       assert, to prevent others from debugging like I did.
+
 Tue Dec 12 17:01:38 CET 2006 Paolo Molaro <[EMAIL PROTECTED]>
 
        * mini.c: enable code which was incorrectly commented

Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2006-12-13 07:20:26 UTC (rev 69437)
+++ trunk/mono/mono/mini/mini.c 2006-12-13 07:25:06 UTC (rev 69438)
@@ -6871,7 +6871,11 @@
                                token = read32 (ip + 2);
                                func = mono_method_get_wrapper_data (method, 
token);
                                info = mono_find_jit_icall_by_addr (func);
-                               g_assert (info);
+                               if (info == NULL){
+                                       g_error ("An attempt has been made to 
perform an icall to address %p, "
+                                                "but the address has not been 
registered as an icall\n", info);
+                                       g_assert_not_reached ();
+                               }
 
                                CHECK_STACK (info->sig->param_count);
                                sp -= info->sig->param_count;

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

Reply via email to