projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mono build with disabled sgen (#4915)
[mono.git]
/
mono
/
dis
/
get.c
diff --git
a/mono/dis/get.c
b/mono/dis/get.c
index f3724e4384debca76a5eae810a91e4dc8333e278..ca9c92e0ae60cdb0a808a654ade306a8d2565c70 100755
(executable)
--- 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);
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;
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);
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;
}
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);
MonoMethod *mh = NULL;
mh = mono_get_method_checked (m, decl, NULL, (MonoGenericContext *) container, &error);
- if (mh && (mh->klass && (m
h->klass->generic_class || mh->klass->generic_container
))) {
+ if (mh && (mh->klass && (m
ono_class_is_ginst (mh->klass) || mono_class_is_gtd (mh->klass)
))) {
char *meth_str;
char *ret;
char *meth_str;
char *ret;