Merge pull request #1334 from ztone/delegate

[mono.git] / mono / dis / dump.c

diff --git a/mono/dis/dump.c b/mono/dis/dump.c
index 2b3a4851de03b4f5c20ec601ef3d9a0e7385606f..391ec7fbc777e7ca95406b522cc0345b413cdd14 100755 (executable)
--- a/mono/dis/dump.c
+++ b/mono/dis/dump.c
@@ -566,6 +566,7 @@ dump_table_method (MonoImage *m)
        current_type = 1;
        last_m = first_m = 1;
        for (i = 1; i <= t->rows; i++){
+               MonoError error;
                guint32 cols [MONO_METHOD_SIZE];
                char *sig, *impl_flags;
                const char *sigblob;
@@ -583,13 +584,17 @@ dump_table_method (MonoImage *m)
                                mono_metadata_string_heap (m, mono_metadata_decode_row_col (td, current_type - 2, MONO_TYPEDEF_NAME)));
                        first_m = last_m;
                        type_container = mono_metadata_load_generic_params (m, MONO_TOKEN_TYPE_DEF | (current_type - 1), NULL);
-                       if (type_container)
-                               mono_metadata_load_generic_param_constraints (m, MONO_TOKEN_TYPE_DEF | (current_type - 1), type_container);
+                       if (type_container) {
+                               mono_metadata_load_generic_param_constraints_checked (m, MONO_TOKEN_TYPE_DEF | (current_type - 1), type_container, &error);
+                               g_assert (mono_error_ok (&error)); /*FIXME don't swallow the error message*/
+                       }
                }
 
                method_container = mono_metadata_load_generic_params (m, MONO_TOKEN_METHOD_DEF | i, type_container);
-               if (method_container)
-                       mono_metadata_load_generic_param_constraints (m, MONO_TOKEN_METHOD_DEF | i, method_container);
+               if (method_container) {
+                       mono_metadata_load_generic_param_constraints_checked (m, MONO_TOKEN_METHOD_DEF | i, method_container, &error);
+                       g_assert (mono_error_ok (&error)); /*FIXME don't swallow the error message*/
+               }
                mono_metadata_decode_table_row (m, MONO_TABLE_METHOD, i - 1, cols, MONO_METHOD_SIZE);
                sigblob = mono_metadata_blob_heap (m, cols [MONO_METHOD_SIGNATURE]);
                mono_metadata_decode_blob_size (sigblob, &sigblob);