Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[mini] Use MonoClass getters in a few files #7771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lambdageek merged 5 commits into from
Mar 23, 2018
Merged

[mini] Use MonoClass getters in a few files #7771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c19c66
[metadata] Use getters in a few ilgen files
lambdageek Mar 21, 2018
aa3fc4b
[mini] Use MonoClass getters in several files
lambdageek Mar 22, 2018
aeffd19
[mini] Use MonoClass getters in mini-generic-sharing.c
lambdageek Mar 22, 2018
9bbb4d1
[debugger-agent] Use MonoClass getters
lambdageek Mar 22, 2018
ce99bfe
[monodis] Use MonoClass getters in get.c
lambdageek Mar 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions mono/dis/get.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ dis_stringify_array (MonoImage *m, MonoArrayType *array, gboolean is_def)
{
char *type, *arr_str, *ret;

type = dis_stringify_type (m, &array->eklass->byval_arg, is_def);
type = dis_stringify_type (m, m_class_get_byval_arg (array->eklass), is_def);
arr_str = stringify_array (array->rank, array->numsizes, array->numlobounds, array->sizes, array->lobounds);

ret = g_strconcat (type, arr_str, NULL);
Expand Down Expand Up @@ -827,7 +827,7 @@ get_generic_param (MonoImage *m, MonoGenericContainer *container)
first = 0;
} else
g_string_append (result, ", ");
sig = dis_stringify_type (m, &((*constr)->byval_arg), TRUE);
sig = dis_stringify_type (m, m_class_get_byval_arg (*constr), TRUE);
g_string_append (result, sig);
g_free (sig);
}
Expand Down Expand Up @@ -1054,22 +1054,22 @@ get_escaped_class_name (MonoClass *c)
{
char *result, *esname;

if (c->type_token == mono_metadata_make_token (MONO_TABLE_TYPEDEF, 1))
if (m_class_get_type_token (c) == mono_metadata_make_token (MONO_TABLE_TYPEDEF, 1))
/* <Module> */
return NULL;

if (c->rank || c->byval_arg.type == MONO_TYPE_PTR)
if (m_class_get_rank (c) || m_class_get_byval_arg (c)->type == MONO_TYPE_PTR)
g_assert (0);

esname = get_escaped_name (c->name);
esname = get_escaped_name (m_class_get_name (c));

if (c->nested_in){
char *part_a = get_escaped_class_name (c->nested_in);
if (m_class_get_nested_in (c)){
char *part_a = get_escaped_class_name (m_class_get_nested_in (c));

result = g_strdup_printf ("%s/%s", part_a, esname);
g_free (part_a);
} else if (*c->name_space)
result = g_strdup_printf ("%s.%s", c->name_space, esname);
} else if (*m_class_get_name_space (c))
result = g_strdup_printf ("%s.%s", m_class_get_name_space (c), esname);
else
result = g_strdup (esname);

Expand All @@ -1081,27 +1081,27 @@ char *
dis_stringify_object_with_class (MonoImage *m, MonoClass *c, gboolean prefix, gboolean is_def)
{
/* FIXME: handle MONO_TYPE_OBJECT ... */
MonoType *type = &c->byval_arg;
MonoType *type = m_class_get_byval_arg (c);
const char *otype = type->type == MONO_TYPE_VALUETYPE ? "valuetype " : "class " ;
char *assemblyref = NULL, *result, *esname, *generic = NULL;

if (c->type_token == mono_metadata_make_token (MONO_TABLE_TYPEDEF, 1))
if (m_class_get_type_token (c) == mono_metadata_make_token (MONO_TABLE_TYPEDEF, 1))
/* <Module> */
return NULL;

if (m != c->image) {
if (c->image->assembly_name) {
if (m != m_class_get_image (c)) {
if (m_class_get_image (c)->assembly_name) {
/* we cheat */
if (substitute_with_mscorlib_p && !strcmp ("corlib", c->image->assembly_name))
if (substitute_with_mscorlib_p && !strcmp ("corlib", m_class_get_image (c)->assembly_name))
assemblyref = g_strdup_printf ("[%s]", "mscorlib");
else {
char *esc = get_escaped_name (c->image->assembly->aname.name);
char *esc = get_escaped_name (m_class_get_image (c)->assembly->aname.name);

assemblyref = g_strdup_printf ("[%s]", esc);
g_free (esc);
}
} else {
assemblyref = g_strdup_printf ("[.module %s]", c->image->module_name);
assemblyref = g_strdup_printf ("[.module %s]", m_class_get_image (c)->module_name);
}
}

Expand Down Expand Up @@ -1195,7 +1195,7 @@ dis_stringify_type (MonoImage *m, MonoType *type, gboolean is_def)
}
case MONO_TYPE_SZARRAY: {
char *child_type;
child_type = dis_stringify_type (m, &type->data.klass->byval_arg, is_def);
child_type = dis_stringify_type (m, m_class_get_byval_arg (type->data.klass), is_def);

bare = g_strdup_printf ("%s[]", child_type);
g_free (child_type);
Expand Down Expand Up @@ -1224,7 +1224,7 @@ dis_stringify_type (MonoImage *m, MonoType *type, gboolean is_def)
MonoGenericInst *inst;
int i;
char *generic_type = dis_stringify_type (
m, &type->data.generic_class->container_class->byval_arg, is_def);
m, m_class_get_byval_arg (type->data.generic_class->container_class), is_def);
inst = type->data.generic_class->context.class_inst;
for (i = 0; i < inst->type_argc; i++){
char *t = dis_stringify_type (m, inst->type_argv [i], is_def);
Expand Down Expand Up @@ -1950,7 +1950,7 @@ get_method_core (MonoImage *m, guint32 token, gboolean fullsig, MonoGenericConta
if (mono_method_signature (mh)->is_inflated)
container = mono_method_get_generic_container (((MonoMethodInflated *) mh)->declaring);
esname = get_escaped_name (mh->name);
sig = dis_stringify_type (m, &mh->klass->byval_arg, TRUE);
sig = dis_stringify_type (m, m_class_get_byval_arg (mh->klass), TRUE);
char *token_comment = get_token_comment (NULL, token);
name = g_strdup_printf ("%s%s%s%s", sig ? sig : "", token_comment ? token_comment : "", sig ? "::" : "", esname);
g_free (sig);
Expand Down Expand Up @@ -2052,7 +2052,7 @@ get_methoddef (MonoImage *m, guint32 idx)

mh = mono_get_method_checked (m, MONO_TOKEN_METHOD_DEF | idx, NULL, NULL, error);
if (mh) {
sig = dis_stringify_type (m, &mh->klass->byval_arg, FALSE);
sig = dis_stringify_type (m, m_class_get_byval_arg (mh->klass), FALSE);
name = g_strdup_printf ("%s%s%s",
sig ? sig : "",
sig ? "::" : "",
Expand Down
4 changes: 2 additions & 2 deletions mono/metadata/marshal-ilgen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4069,9 +4069,9 @@ emit_thunk_invoke_wrapper_ilgen (MonoMethodBuilder *mb, MonoMethod *method, Mono

if (mono_threads_is_blocking_transition_enabled ()) {
/* local 4, dummy local used to get a stack address for suspend funcs */
coop_gc_stack_dummy = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
coop_gc_stack_dummy = mono_mb_add_local (mb, m_class_get_byval_arg (mono_defaults.int_class));
/* local 5, the local to be used when calling the suspend funcs */
coop_gc_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
coop_gc_var = mono_mb_add_local (mb, m_class_get_byval_arg (mono_defaults.int_class));
}

/* clear exception arg */
Expand Down
2 changes: 1 addition & 1 deletion mono/metadata/method-builder-ilgen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ create_method_ilgen (MonoMethodBuilder *mb, MonoMethodSignature *signature, int

g_assert (mb != NULL);

image = mb->method->klass->image;
image = m_class_get_image (mb->method->klass);

if (mb->dynamic) {
method = mb->method;
Expand Down
10 changes: 5 additions & 5 deletions mono/mini/alias-analysis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ static gboolean
lower_load (MonoCompile *cfg, MonoInst *load, MonoInst *ldaddr)
{
MonoInst *var = (MonoInst *)ldaddr->inst_p0;
MonoType *type = &var->klass->byval_arg;
MonoType *type = m_class_get_byval_arg (var->klass);
int replaced_op = mono_type_to_load_membase (cfg, type);

if (load->opcode == OP_LOADV_MEMBASE && load->klass != var->klass) {
if (cfg->verbose_level > 2)
printf ("Incompatible load_vtype classes %s x %s\n", load->klass->name, var->klass->name);
printf ("Incompatible load_vtype classes %s x %s\n", m_class_get_name (load->klass), m_class_get_name (var->klass));
return FALSE;
}

Expand All @@ -73,12 +73,12 @@ static gboolean
lower_store (MonoCompile *cfg, MonoInst *store, MonoInst *ldaddr)
{
MonoInst *var = (MonoInst *)ldaddr->inst_p0;
MonoType *type = &var->klass->byval_arg;
MonoType *type = m_class_get_byval_arg (var->klass);
int replaced_op = mono_type_to_store_membase (cfg, type);

if (store->opcode == OP_STOREV_MEMBASE && store->klass != var->klass) {
if (cfg->verbose_level > 2)
printf ("Incompatible store_vtype classes %s x %s\n", store->klass->name, store->klass->name);
printf ("Incompatible store_vtype classes %s x %s\n", m_class_get_name (store->klass), m_class_get_name (store->klass));
return FALSE;
}

Expand Down Expand Up @@ -108,7 +108,7 @@ static gboolean
lower_store_imm (MonoCompile *cfg, MonoInst *store, MonoInst *ldaddr)
{
MonoInst *var = (MonoInst *)ldaddr->inst_p0;
MonoType *type = &var->klass->byval_arg;
MonoType *type = m_class_get_byval_arg (var->klass);
int store_op = mono_type_to_store_membase (cfg, type);
if (store_op == OP_STOREV_MEMBASE || store_op == OP_STOREX_MEMBASE)
return FALSE;
Expand Down
4 changes: 2 additions & 2 deletions mono/mini/aot-runtime-wasm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ type_to_c (MonoType *t)
case MONO_TYPE_VOID:
return 'V';
case MONO_TYPE_VALUETYPE:
if (t->data.klass->enumtype) {
if (m_class_is_enum_type (t->data.klass)) {
t = mono_class_enum_basetype (t->data.klass);
goto handle_enum;
}

return 'I';
case MONO_TYPE_GENERICINST:
if (t->data.klass->valuetype)
if (m_class_is_valuetype (t->data.klass))
return 'S';
return 'I';
default:
Expand Down
Loading