[corlib] Versioning from reference sources

[mono.git] / mono / metadata / debug-helpers.c

diff --git a/mono/metadata/debug-helpers.c b/mono/metadata/debug-helpers.c
index a20e8ae06e03a9ade8d5e64419f4d0a4b9122220..d4027a01f5d2ce1dba0898d4f064b99ffbcc5c30 100644 (file)
--- a/mono/metadata/debug-helpers.c
+++ b/mono/metadata/debug-helpers.c
@@ -198,9 +198,9 @@ mono_type_get_desc (GString *res, MonoType *type, gboolean include_namespace)
        case MONO_TYPE_VAR:
        case MONO_TYPE_MVAR:
                if (type->data.generic_param) {
-                       MonoGenericParamInfo *info = mono_generic_param_info (type->data.generic_param);
-                       if (info)
-                               g_string_append (res, info->name);
+                       const char *name = mono_generic_param_name (type->data.generic_param);
+                       if (name)
+                               g_string_append (res, name);
                        else
                                g_string_append_printf (res, "%s%d", type->type == MONO_TYPE_VAR ? "!" : "!!", mono_generic_param_num (type->data.generic_param));
                } else {
@@ -492,7 +492,6 @@ MonoMethod*
 mono_method_desc_search_in_image (MonoMethodDesc *desc, MonoImage *image)
 {
        MonoClass *klass;
-       const MonoTableInfo *tdef;
        const MonoTableInfo *methods;
        MonoMethod *method;
        int i;
@@ -511,7 +510,8 @@ mono_method_desc_search_in_image (MonoMethodDesc *desc, MonoImage *image)
                return mono_method_desc_search_in_class (desc, klass);
        }
 
-       tdef = mono_image_get_table_info (image, MONO_TABLE_TYPEDEF);
+       /* FIXME: Is this call necessary?  We don't use its result. */
+       mono_image_get_table_info (image, MONO_TABLE_TYPEDEF);
        methods = mono_image_get_table_info (image, MONO_TABLE_METHOD);
        for (i = 0; i < mono_table_info_get_rows (methods); ++i) {
                guint32 token = mono_metadata_decode_row_col (methods, i, MONO_METHOD_NAME);
@@ -575,7 +575,7 @@ dis_one (GString *str, MonoDisHelper *dh, MonoMethod *method, const unsigned cha
                size_t len2;
                char *blob2 = NULL;
 
-               if (!method->klass->image->dynamic) {
+               if (!image_is_dynamic (method->klass->image) && !method_is_dynamic (method)) {
                        token = read32 (ip);
                        blob = mono_metadata_user_string (method->klass->image, mono_metadata_token_index (token));