static MonoClass * mono_class_create_from_typedef (MonoImage *image, guint32 type_token);
+void (*mono_debugger_start_class_init_func) (MonoClass *klass) = NULL;
void (*mono_debugger_class_init_func) (MonoClass *klass) = NULL;
MonoClass *
MonoType *r = g_new0 (MonoType, 1);
*r = *t;
r->attrs = original->attrs;
+ r->byref = original->byref;
mono_stats.generics_metadata_size += sizeof (MonoType);
return r;
}
static void
-mono_type_get_name_recurse (MonoType *type, GString *str, gboolean is_recursed)
+mono_type_get_name_recurse (MonoType *type, GString *str, gboolean is_recursed,
+ gboolean include_arity)
{
MonoClass *klass;
case MONO_TYPE_ARRAY: {
int i, rank = type->data.array->rank;
- mono_type_get_name_recurse (&type->data.array->eklass->byval_arg, str, FALSE);
+ mono_type_get_name_recurse (
+ &type->data.array->eklass->byval_arg, str, FALSE, include_arity);
g_string_append_c (str, '[');
for (i = 1; i < rank; i++)
g_string_append_c (str, ',');
break;
}
case MONO_TYPE_SZARRAY:
- mono_type_get_name_recurse (&type->data.klass->byval_arg, str, FALSE);
+ mono_type_get_name_recurse (
+ &type->data.klass->byval_arg, str, FALSE, include_arity);
g_string_append (str, "[]");
break;
case MONO_TYPE_PTR:
- mono_type_get_name_recurse (type->data.type, str, FALSE);
+ mono_type_get_name_recurse (type->data.type, str, FALSE, include_arity);
g_string_append_c (str, '*');
break;
default:
klass = mono_class_from_mono_type (type);
if (klass->nested_in) {
- mono_type_get_name_recurse (&klass->nested_in->byval_arg, str, TRUE);
+ mono_type_get_name_recurse (
+ &klass->nested_in->byval_arg, str, TRUE, include_arity);
g_string_append_c (str, '+');
}
if (*klass->name_space) {
g_string_append (str, klass->name_space);
g_string_append_c (str, '.');
}
- g_string_append (str, klass->name);
+ if (!include_arity) {
+ char *s = strchr (klass->name, '`');
+ int len = s ? s - klass->name : strlen (klass->name);
+
+ g_string_append_len (str, klass->name, len);
+ } else
+ g_string_append (str, klass->name);
if (is_recursed)
break;
if (klass->generic_inst) {
MonoGenericInst *ginst = klass->generic_inst;
int i;
- g_string_append_c (str, '[');
+ g_string_append_c (str, '<');
for (i = 0; i < ginst->type_argc; i++) {
if (i)
g_string_append_c (str, ',');
- mono_type_get_name_recurse (ginst->type_argv [i], str, FALSE);
+ mono_type_get_name_recurse (
+ ginst->type_argv [i], str, FALSE, include_arity);
}
- g_string_append_c (str, ']');
+ g_string_append_c (str, '>');
} else if (klass->gen_params) {
int i;
- g_string_append_c (str, '[');
+ g_string_append_c (str, '<');
for (i = 0; i < klass->num_gen_params; i++) {
if (i)
g_string_append_c (str, ',');
g_string_append (str, klass->gen_params [i].name);
}
- g_string_append_c (str, ']');
+ g_string_append_c (str, '>');
}
break;
}
* Returns the string representation for type as required by System.Reflection.
* The inverse of mono_reflection_parse_type ().
*/
-char*
-mono_type_get_name (MonoType *type)
+static char*
+_mono_type_get_name (MonoType *type, gboolean is_recursed, gboolean include_arity)
{
GString* result = g_string_new ("");
- mono_type_get_name_recurse (type, result, FALSE);
+ mono_type_get_name_recurse (type, result, is_recursed, include_arity);
if (type->byref)
g_string_append_c (result, '&');
return g_string_free (result, FALSE);
}
+char*
+mono_type_get_name (MonoType *type)
+{
+ return _mono_type_get_name (type, TRUE, TRUE);
+}
+
+char*
+mono_type_get_full_name (MonoType *type)
+{
+ return _mono_type_get_name (type, FALSE, TRUE);
+}
+
gboolean
mono_class_is_open_constructed_type (MonoType *t)
{
}
case MONO_TYPE_GENERICINST: {
MonoGenericInst *oginst = type->data.generic_inst;
- MonoGenericInst *nginst;
+ MonoGenericInst *nginst, *cached;
MonoType *nt;
int i;
nginst->context->ginst = nginst;
mono_loader_lock ();
- nt = g_hash_table_lookup (oginst->klass->image->generic_inst_cache, nginst);
+ cached = g_hash_table_lookup (oginst->klass->image->generic_inst_cache, nginst);
- if (nt) {
+ if (cached) {
g_free (nginst->type_argv);
g_free (nginst);
mono_loader_unlock ();
+
+ nt = dup_type (type, type);
+ nt->data.generic_inst = cached;
return nt;
}
nt = dup_type (type, type);
nt->data.generic_inst = nginst;
- g_hash_table_insert (oginst->klass->image->generic_inst_cache, nginst, nt);
+ g_hash_table_insert (oginst->klass->image->generic_inst_cache, nginst, nginst);
mono_loader_unlock ();
return nt;
}
res->init_locals = header->init_locals;
res->num_locals = header->num_locals;
res->clauses = header->clauses;
- res->gen_params = header->gen_params;
for (i = 0; i < header->num_locals; ++i)
res->locals [i] = mono_class_inflate_generic_type (header->locals [i], context);
return res;
class->instance_size = MAX (real_size, class->instance_size);
}
class->size_inited = 1;
+ class->blittable = blittable;
return;
}
+ if (layout == TYPE_ATTRIBUTE_AUTO_LAYOUT)
+ blittable = FALSE;
+
class->fields = g_new0 (MonoClassField, top);
/*
/* Only do these checks if we still think this type is blittable */
if (blittable && !(field->type->attrs & FIELD_ATTRIBUTE_STATIC)) {
- if (field->type->byref) {
+ if (field->type->byref || MONO_TYPE_IS_REFERENCE (field->type)) {
blittable = FALSE;
} else {
MonoClass *field_class = mono_class_from_mono_type (field->type);
mono_metadata_field_info (m, idx, NULL, &rva, NULL);
if (!rva)
g_warning ("field %s in %s should have RVA data, but hasn't", field->name, class->name);
- field->data = mono_cli_rva_map (class->image->image_info, rva);
+ field->data = mono_image_rva_map (class->image, rva);
}
if (class->enumtype && !(cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_STATIC)) {
int size, align;
field = &class->fields [i];
- if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
+ if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC) || field->type->attrs & FIELD_ATTRIBUTE_LITERAL)
continue;
if (mono_field_is_deleted (field))
continue;
for (l = 0; l < ic->method.count; l++) {
MonoMethod *im = ic->methods [l];
- char *qname, *fqname;
+ char *qname, *fqname, *cname, *the_cname;
MonoClass *k1;
if (vtable [io + l])
continue;
+
+ if (ic->generic_inst) {
+ MonoClass *the_ic = mono_class_from_mono_type (ic->generic_inst->generic_type);
+ the_cname = _mono_type_get_name (&the_ic->byval_arg, TRUE, FALSE);
+ cname = the_cname;
+ } else {
+ the_cname = NULL;
+ cname = ic->name;
+ }
- qname = g_strconcat (ic->name, ".", im->name, NULL);
+ qname = g_strconcat (cname, ".", im->name, NULL);
if (ic->name_space && ic->name_space [0])
- fqname = g_strconcat (ic->name_space, ".", ic->name, ".", im->name, NULL);
+ fqname = g_strconcat (ic->name_space, ".", cname, ".", im->name, NULL);
else
fqname = NULL;
}
}
}
+ g_free (the_cname);
g_free (qname);
g_free (fqname);
}
class->init_pending = 1;
+ if (mono_debugger_start_class_init_func)
+ mono_debugger_start_class_init_func (class);
+
mono_stats.initialized_class_count++;
if (class->generic_inst && !class->generic_inst->is_dynamic) {
*/
setup_interface_offsets (class, 0);
mono_loader_unlock ();
+
+ if (mono_debugger_class_init_func)
+ mono_debugger_class_init_func (class);
+
return;
}
mono_debugger_class_init_func (class);
}
-
void
mono_class_setup_mono_type (MonoClass *class)
{
}
g_assert (mono_metadata_token_table (type_token) == MONO_TABLE_TYPEDEF);
-
+
mono_metadata_decode_row (tt, tidx - 1, cols, MONO_TYPEDEF_SIZE);
name = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
- if (cols [MONO_TYPEDEF_EXTENDS])
- parent = mono_class_get (image, mono_metadata_token_from_dor (cols [MONO_TYPEDEF_EXTENDS]));
- interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &icount);
-
class = g_malloc0 (sizeof (MonoClass));
-
- g_hash_table_insert (image->class_cache, GUINT_TO_POINTER (type_token), class);
-
- class->interfaces = interfaces;
- class->interface_count = icount;
class->name = name;
class->name_space = nspace;
class->type_token = type_token;
class->flags = cols [MONO_TYPEDEF_FLAGS];
+ g_hash_table_insert (image->class_cache, GUINT_TO_POINTER (type_token), class);
+
+ if (cols [MONO_TYPEDEF_EXTENDS])
+ parent = mono_class_get (image, mono_metadata_token_from_dor (cols [MONO_TYPEDEF_EXTENDS]));
+ interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &icount);
+
+ class->interfaces = interfaces;
+ class->interface_count = icount;
+
if ((class->flags & TYPE_ATTRIBUTE_STRING_FORMAT_MASK) == TYPE_ATTRIBUTE_UNICODE_CLASS)
class->unicode = 1;
/* fixme: maybe we must set this on windows
result = g_new0 (MonoClass, 1);
result->parent = NULL; /* no parent for PTR types */
- result->name = "System";
- result->name_space = "MonoPtrFakeClass";
+ result->name_space = el_class->name_space;
+ result->name = g_strdup_printf ("%s*", el_class->name);
result->image = el_class->image;
result->inited = TRUE;
result->flags = TYPE_ATTRIBUTE_CLASS | (el_class->flags & TYPE_ATTRIBUTE_VISIBILITY_MASK);
class = mono_array_class_get (type->data.klass, 1);
break;
case MONO_TYPE_PTR:
- class = mono_class_from_mono_type (type->data.type);
+ class = mono_ptr_class_get (type->data.type);
break;
case MONO_TYPE_GENERICINST:
g_assert (type->data.generic_inst->klass);
} else {
if (!MONO_CLASS_IS_INTERFACE (klass) && mono_class_has_parent (klass, klassc))
return TRUE;
- if (klass->generic_inst) {
- MonoType *parent = klass->generic_inst->parent;
- if (!parent)
- return FALSE;
-
- if (mono_metadata_type_equal (parent, &klassc->byval_arg))
- return TRUE;
- klass = mono_class_from_mono_type (parent);
- goto again;
- }
}
/*
*/
if (klassc == mono_defaults.object_class)
return TRUE;
+
+ if (klass->generic_inst) {
+ MonoType *parent = klass->generic_inst->parent;
+ if (!parent)
+ return FALSE;
+
+ if (mono_metadata_type_equal (parent, &klassc->byval_arg))
+ return TRUE;
+ klass = mono_class_from_mono_type (parent);
+ goto again;
+ }
return FALSE;
}
gint32
mono_class_array_element_size (MonoClass *klass)
{
- int t = klass->byval_arg.type;
+ MonoType *type = &klass->byval_arg;
handle_enum:
- switch (t) {
+ switch (type->type) {
case MONO_TYPE_I1:
case MONO_TYPE_U1:
case MONO_TYPE_BOOLEAN:
case MONO_TYPE_R8:
return 8;
case MONO_TYPE_VALUETYPE:
- if (klass->enumtype) {
- t = klass->enum_basetype->type;
+ if (type->data.klass->enumtype) {
+ type = type->data.klass->enum_basetype;
goto handle_enum;
}
- return mono_class_instance_size (klass) - sizeof (MonoObject);
+ return mono_class_instance_size (type->data.klass) - sizeof (MonoObject);
+ case MONO_TYPE_GENERICINST:
+ type = type->data.generic_inst->generic_type;
+ goto handle_enum;
default:
- g_error ("unknown type 0x%02x in mono_class_array_element_size", t);
+ g_error ("unknown type 0x%02x in mono_class_array_element_size", type->type);
}
return -1;
}
projects / mono.git / blobdiff