X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2Fget.c;h=ca9c92e0ae60cdb0a808a654ade306a8d2565c70;hb=c271644e20ba8c7a9aff9a5adff31f1458f5b693;hp=f3724e4384debca76a5eae810a91e4dc8333e278;hpb=f9596050629ebf0d8d24fb256cc08f98d6d2c7e7;p=mono.git

diff --git a/mono/dis/get.c b/mono/dis/get.c
index f3724e4384d..ca9c92e0ae6 100755
--- a/mono/dis/get.c
+++ b/mono/dis/get.c
@@ -1103,8 +1103,8 @@ dis_stringify_object_with_class (MonoImage *m, MonoClass *c, gboolean prefix, gb
 
 	esname = get_escaped_class_name (c);
 
-	if (c->generic_class) {
-		MonoGenericClass *gclass = c->generic_class;
+	if (mono_class_is_ginst (c)) {
+		MonoGenericClass *gclass = mono_class_get_generic_class (c);
 		MonoGenericInst *inst = gclass->context.class_inst;
 		GString *str = g_string_new ("");
 		int i;
@@ -1847,7 +1847,7 @@ get_memberref_container (MonoImage *m, guint32 mrp_token, MonoGenericContainer *
 	case 4: /* TypeSpec */
 		klass = mono_class_get_full (m, MONO_TOKEN_TYPE_SPEC | idx, (MonoGenericContext *) container);
 		g_assert (klass);
-		return klass->generic_class ? klass->generic_class->container_class->generic_container : NULL;
+		return mono_class_is_ginst (klass) ? mono_class_get_generic_container (mono_class_get_generic_class (klass)->container_class) : NULL;
 	}
 	g_assert_not_reached ();
 	return NULL;
@@ -3108,7 +3108,7 @@ get_method_override (MonoImage *m, guint32 token, MonoGenericContainer *containe
 			MonoMethod *mh = NULL;
 			mh = mono_get_method_checked (m, decl, NULL, (MonoGenericContext *) container, &error);
 
-			if (mh && (mh->klass && (mh->klass->generic_class || mh->klass->generic_container))) {
+			if (mh && (mh->klass && (mono_class_is_ginst (mh->klass) || mono_class_is_gtd (mh->klass)))) {
 				char *meth_str;
 				char *ret;