{
guint32 bitfield = t->size_bitfield;
int i, count = mono_metadata_table_count (bitfield);
- const char *data = t->base + idx * t->row_size;
+ const char *data;
+
+ g_assert (idx < t->rows);
+ data = t->base + idx * t->row_size;
g_assert (res_size == count);
{
guint32 bitfield = t->size_bitfield;
int i;
- register const char *data = t->base + idx * t->row_size;
+ register const char *data;
register int n;
+ g_assert (idx < t->rows);
g_assert (col < mono_metadata_table_count (bitfield));
+ data = t->base + idx * t->row_size;
n = mono_metadata_table_size (bitfield, 0);
for (i = 0; i < col; ++i) {
}
static gboolean
-mono_generic_inst_equal (gconstpointer ka, gconstpointer kb)
+mono_generic_inst_equal_full (const MonoGenericInst *a, const MonoGenericInst *b, gboolean signature_only)
{
- const MonoGenericInst *a = (const MonoGenericInst *) ka;
- const MonoGenericInst *b = (const MonoGenericInst *) kb;
int i;
+ if (a->id && b->id) {
+ if (a->id == b->id)
+ return TRUE;
+ if (!signature_only)
+ return FALSE;
+ }
+
if (a->is_open != b->is_open || a->type_argc != b->type_argc)
return FALSE;
for (i = 0; i < a->type_argc; ++i) {
- if (!do_mono_metadata_type_equal (a->type_argv [i], b->type_argv [i], FALSE))
+ if (!do_mono_metadata_type_equal (a->type_argv [i], b->type_argv [i], signature_only))
return FALSE;
}
return TRUE;
}
+static gboolean
+mono_generic_inst_equal (gconstpointer ka, gconstpointer kb)
+{
+ const MonoGenericInst *a = (const MonoGenericInst *) ka;
+ const MonoGenericInst *b = (const MonoGenericInst *) kb;
+
+ return mono_generic_inst_equal_full (a, b, FALSE);
+}
+
static guint
mono_generic_class_hash (gconstpointer data)
{
guint hash = mono_metadata_type_hash (&gclass->container_class->byval_arg);
hash *= 13;
+ hash += gclass->is_tb_open;
hash += mono_metadata_generic_context_hash (&gclass->context);
return hash;
if (sig->params [i])
mono_metadata_free_type (sig->params [i]);
}
- /* FIXME: The signature is allocated from a mempool */
- //g_free (sig);
+ g_free (sig);
}
static gboolean
g_print (">");
}*/
-static gboolean gclass_in_image (gpointer key, gpointer value, gpointer data);
+static gboolean type_in_image (MonoType *type, MonoImage *image);
-typedef struct {
- MonoImage *image;
- GSList *ginst_list;
- GSList *gclass_list;
-} CleanForImageUserData;
+static gboolean
+signature_in_image (MonoMethodSignature *sig, MonoImage *image)
+{
+ gpointer iter = NULL;
+ MonoType *p;
+
+ while ((p = mono_signature_get_params (sig, &iter)) != NULL)
+ if (type_in_image (p, image))
+ return TRUE;
+
+ return type_in_image (mono_signature_get_return_type (sig), image);
+}
static gboolean
-ginst_in_image (gpointer key, gpointer value, gpointer data)
+ginst_in_image (MonoGenericInst *ginst, MonoImage *image)
{
- CleanForImageUserData *user_data = (CleanForImageUserData*)data;
- MonoImage *image = user_data->image;
- MonoGenericInst *ginst = key;
- MonoClass *klass;
int i;
- for (i = 0; i < ginst->type_argc; ++i) {
- MonoType *type = ginst->type_argv [i];
-
- /* FIXME: Avoid a possible mono_class_inst inside mono_class_from_mono_type */
- if (type->type == MONO_TYPE_GENERICINST) {
- if (gclass_in_image (type->data.generic_class, NULL, data)) {
- if (!g_slist_find (user_data->ginst_list, ginst))
- user_data->ginst_list = g_slist_append (user_data->ginst_list, ginst);
- return TRUE;
- }
- continue;
- }
- klass = mono_class_from_mono_type (ginst->type_argv [i]);
- if (klass->image == image) {
- /*dump_ginst (ginst);
- g_print (" removed\n");*/
- if (!g_slist_find (user_data->ginst_list, ginst))
- user_data->ginst_list = g_slist_append (user_data->ginst_list, ginst);
+ for (i = 0; i < ginst->type_argc; ++i) {
+ if (type_in_image (ginst->type_argv [i], image))
return TRUE;
- }
}
+
return FALSE;
}
static gboolean
-gclass_in_image (gpointer key, gpointer value, gpointer data)
+gclass_in_image (MonoGenericClass *gclass, MonoImage *image)
+{
+ return gclass->container_class->image == image ||
+ ginst_in_image (gclass->context.class_inst, image);
+}
+
+static gboolean
+type_in_image (MonoType *type, MonoImage *image)
+{
+retry:
+ switch (type->type) {
+ case MONO_TYPE_GENERICINST:
+ return gclass_in_image (type->data.generic_class, image);
+ case MONO_TYPE_PTR:
+ type = type->data.type;
+ goto retry;
+ case MONO_TYPE_SZARRAY:
+ type = &type->data.klass->byval_arg;
+ goto retry;
+ case MONO_TYPE_ARRAY:
+ type = &type->data.array->eklass->byval_arg;
+ goto retry;
+ case MONO_TYPE_FNPTR:
+ return signature_in_image (type->data.method, image);
+ case MONO_TYPE_VAR:
+ if (type->data.generic_param->owner) {
+ g_assert (!type->data.generic_param->owner->is_method);
+ return type->data.generic_param->owner->owner.klass->image == image;
+ } else {
+ return type->data.generic_param->image == image;
+ }
+ case MONO_TYPE_MVAR:
+ if (type->data.generic_param->owner) {
+ g_assert (type->data.generic_param->owner->is_method);
+ if (!type->data.generic_param->owner->owner.method)
+ /* RefEmit created generic param whose method is not finished */
+ return FALSE;
+ return type->data.generic_param->owner->owner.method->klass->image == image;
+ } else {
+ return type->data.generic_param->image == image;
+ }
+ default:
+ /* At this point, we should've avoided all potential allocations in mono_class_from_mono_type () */
+ return image == mono_class_from_mono_type (type)->image;
+ }
+}
+
+typedef struct {
+ MonoImage *image;
+ GSList *list;
+} CleanForImageUserData;
+
+static gboolean
+steal_gclass_in_image (gpointer key, gpointer value, gpointer data)
{
- CleanForImageUserData *user_data = (CleanForImageUserData*)data;
- MonoImage *image = user_data->image;
MonoGenericClass *gclass = key;
- gboolean match = FALSE;
+ CleanForImageUserData *user_data = data;
- if (ginst_in_image (gclass->context.class_inst, NULL, data))
- match = TRUE;
- if (gclass->container_class->image == image)
- match = TRUE;
+ if (!gclass_in_image (gclass, user_data->image))
+ return FALSE;
- if (match) {
- if (!g_slist_find (user_data->gclass_list, gclass))
- user_data->gclass_list = g_slist_append (user_data->gclass_list, gclass);
- return TRUE;
- } else {
+ user_data->list = g_slist_prepend (user_data->list, gclass);
+ return TRUE;
+}
+
+static gboolean
+steal_ginst_in_image (gpointer key, gpointer value, gpointer data)
+{
+ MonoGenericInst *ginst = key;
+ CleanForImageUserData *user_data = data;
+
+ if (!ginst_in_image (ginst, user_data->image))
return FALSE;
- }
+
+ user_data->list = g_slist_prepend (user_data->list, ginst);
+ return TRUE;
}
static gboolean
inflated_method_in_image (gpointer key, gpointer value, gpointer data)
{
- CleanForImageUserData *user_data = (CleanForImageUserData*)data;
- MonoImage *image = user_data->image;
+ MonoImage *image = data;
MonoMethodInflated *method = key;
- if (method->declaring->klass->image == image)
- return TRUE;
- if (method->context.class_inst && ginst_in_image (method->context.class_inst, NULL, data))
- return TRUE;
- if (method->context.method_inst && ginst_in_image (method->context.method_inst, NULL, data))
- return TRUE;
- return FALSE;
+ return method->declaring->klass->image == image ||
+ (method->context.class_inst && ginst_in_image (method->context.class_inst, image)) ||
+ (method->context.method_inst && ginst_in_image (method->context.method_inst, image));
}
static gboolean
inflated_signature_in_image (gpointer key, gpointer value, gpointer data)
{
+ MonoImage *image = data;
MonoInflatedMethodSignature *sig = key;
- if (sig->context.class_inst && ginst_in_image (sig->context.class_inst, NULL, data))
- return TRUE;
- if (sig->context.method_inst && ginst_in_image (sig->context.method_inst, NULL, data))
- return TRUE;
- return FALSE;
+ return /* signature_in_image (sig->sig, image) || */
+ (sig->context.class_inst && ginst_in_image (sig->context.class_inst, image)) ||
+ (sig->context.method_inst && ginst_in_image (sig->context.method_inst, image));
}
void
mono_metadata_clean_for_image (MonoImage *image)
{
- CleanForImageUserData user_data;
+ CleanForImageUserData ginst_data, gclass_data;
GSList *l;
/* The data structures could reference each other so we delete them in two phases */
- user_data.image = image;
- user_data.ginst_list = NULL;
- user_data.gclass_list = NULL;
+ ginst_data.image = gclass_data.image = image;
+ ginst_data.list = gclass_data.list = NULL;
mono_loader_lock ();
/* Collect the items to delete and remove them from the hash table */
- g_hash_table_foreach_steal (generic_inst_cache, ginst_in_image, &user_data);
- g_hash_table_foreach_steal (generic_class_cache, gclass_in_image, &user_data);
+ g_hash_table_foreach_steal (generic_inst_cache, steal_ginst_in_image, &ginst_data);
+ g_hash_table_foreach_steal (generic_class_cache, steal_gclass_in_image, &gclass_data);
if (generic_method_cache)
- g_hash_table_foreach_remove (generic_method_cache, inflated_method_in_image, &user_data);
+ g_hash_table_foreach_remove (generic_method_cache, inflated_method_in_image, image);
if (generic_signature_cache)
- g_hash_table_foreach_remove (generic_signature_cache, inflated_signature_in_image, &user_data);
+ g_hash_table_foreach_remove (generic_signature_cache, inflated_signature_in_image, image);
/* Delete the removed items */
- for (l = user_data.ginst_list; l; l = l->next)
+ for (l = ginst_data.list; l; l = l->next)
free_generic_inst (l->data);
- for (l = user_data.gclass_list; l; l = l->next)
+ for (l = gclass_data.list; l; l = l->next)
free_generic_class (l->data);
- g_slist_free (user_data.ginst_list);
- g_slist_free (user_data.gclass_list);
+ g_slist_free (ginst_data.list);
+ g_slist_free (gclass_data.list);
mono_loader_unlock ();
}
int i;
/* FIXME: The dynamic case */
- if (gclass->cached_class && !gclass->cached_class->image->dynamic) {
+ if (gclass->cached_class && !gclass->cached_class->image->dynamic && !mono_generic_class_is_generic_type_definition (gclass)) {
MonoClass *class = gclass->cached_class;
/* Allocated in mono_class_init () */
return ginst;
}
+static gboolean
+mono_metadata_is_type_builder_generic_type_definition (MonoClass *container_class, MonoGenericInst *inst, gboolean is_dynamic)
+{
+ MonoGenericContainer *container = container_class->generic_container;
+
+ if (!is_dynamic || container_class->wastypebuilder || container->type_argc != inst->type_argc)
+ return FALSE;
+ return inst == container->context.class_inst;
+}
+
/*
* mono_metadata_lookup_generic_class:
*
mono_metadata_lookup_generic_class (MonoClass *container_class, MonoGenericInst *inst, gboolean is_dynamic)
{
MonoGenericClass *gclass;
-
MonoGenericClass helper;
+ gboolean is_tb_open = mono_metadata_is_type_builder_generic_type_definition (container_class, inst, is_dynamic);
+
helper.container_class = container_class;
helper.context.class_inst = inst;
helper.context.method_inst = NULL;
helper.is_dynamic = is_dynamic; /* We use this in a hash lookup, which does not attempt to downcast the pointer */
+ helper.is_tb_open = is_tb_open;
helper.cached_class = NULL;
mono_loader_lock ();
gclass = g_new0 (MonoGenericClass, 1);
}
+ gclass->is_tb_open = is_tb_open;
gclass->container_class = container_class;
gclass->context.class_inst = inst;
gclass->context.method_inst = NULL;
+ if (inst == container_class->generic_container->context.class_inst && !is_tb_open)
+ gclass->cached_class = container_class;
g_hash_table_insert (generic_class_cache, gclass, gclass);
param->name = mono_mempool_alloc0 (m->mempool, 8);
sprintf ((char*)param->name, "%d", index);
param->num = index;
+ param->image = m;
return param;
}
*/
int
mono_type_stack_size (MonoType *t, int *align)
+{
+ return mono_type_stack_size_internal (t, align, FALSE);
+}
+
+int
+mono_type_stack_size_internal (MonoType *t, int *align, gboolean allow_open)
{
int tmp;
guint32 size;
if (t->data.klass->enumtype)
- return mono_type_stack_size (t->data.klass->enum_basetype, align);
+ return mono_type_stack_size_internal (t->data.klass->enum_basetype, align, allow_open);
else {
size = mono_class_value_size (t->data.klass, (guint32*)align);
MonoGenericClass *gclass = t->data.generic_class;
MonoClass *container_class = gclass->container_class;
- g_assert (!gclass->context.class_inst->is_open);
+ if (!allow_open)
+ g_assert (!gclass->context.class_inst->is_open);
if (container_class->valuetype) {
if (container_class->enumtype)
- return mono_type_stack_size (container_class->enum_basetype, align);
+ return mono_type_stack_size_internal (container_class->enum_basetype, align, allow_open);
else {
guint32 size = mono_class_value_size (mono_class_from_mono_type (t), (guint32*)align);
static gboolean
_mono_metadata_generic_class_equal (const MonoGenericClass *g1, const MonoGenericClass *g2, gboolean signature_only)
{
- int i;
MonoGenericInst *i1 = g1->context.class_inst;
MonoGenericInst *i2 = g2->context.class_inst;
- if (i1->type_argc != i2->type_argc || g1->is_dynamic != g2->is_dynamic)
+ if (g1->is_dynamic != g2->is_dynamic)
return FALSE;
if (!mono_metadata_class_equal (g1->container_class, g2->container_class, signature_only))
return FALSE;
- for (i = 0; i < i1->type_argc; ++i) {
- if (!do_mono_metadata_type_equal (i1->type_argv [i], i2->type_argv [i], signature_only))
- return FALSE;
- }
- return TRUE;
+ if (!mono_generic_inst_equal_full (i1, i2, signature_only))
+ return FALSE;
+ return g1->is_tb_open == g2->is_tb_open;
+}
+
+static gboolean
+_mono_metadata_generic_class_container_equal (const MonoGenericClass *g1, MonoClass *c2, gboolean signature_only)
+{
+ MonoGenericInst *i1 = g1->context.class_inst;
+ MonoGenericInst *i2 = c2->generic_container->context.class_inst;
+
+ if (!mono_metadata_class_equal (g1->container_class, c2, signature_only))
+ return FALSE;
+ if (!mono_generic_inst_equal_full (i1, i2, signature_only))
+ return FALSE;
+ return !g1->is_tb_open;
}
guint
return TRUE;
if (c1->generic_class && c2->generic_class)
return _mono_metadata_generic_class_equal (c1->generic_class, c2->generic_class, signature_only);
+ if (c1->generic_class && c2->generic_container)
+ return _mono_metadata_generic_class_container_equal (c1->generic_class, c2, signature_only);
+ if (c1->generic_container && c2->generic_class)
+ return _mono_metadata_generic_class_container_equal (c2->generic_class, c1, signature_only);
if ((c1->byval_arg.type == MONO_TYPE_VAR) && (c2->byval_arg.type == MONO_TYPE_VAR))
return mono_metadata_generic_param_equal (
c1->byval_arg.data.generic_param, c2->byval_arg.data.generic_param, signature_only);
return do_mono_metadata_type_equal (t1, t2, FALSE);
}
+/**
+ * mono_metadata_type_equal_full:
+ * @t1: a type
+ * @t2: another type
+ * @signature_only: if signature only comparison should be made
+ *
+ * Determine if @t1 and @t2 are signature compatible if @signature_only is #TRUE, otherwise
+ * behaves the same way as mono_metadata_type_equal.
+ * The function mono_metadata_type_equal(a, b) is just a shortcut for mono_metadata_type_equal_full(a, b, FALSE).
+ * Returns: #TRUE if @t1 and @t2 are equal taking @signature_only into account.
+ */
+gboolean
+mono_metadata_type_equal_full (MonoType *t1, MonoType *t2, gboolean signature_only)
+{
+ return do_mono_metadata_type_equal (t1, t2, signature_only);
+}
+
/**
* mono_metadata_signature_equal:
* @sig1: a signature
}
if (!do_mono_metadata_parse_type (type, image, NULL, ptr, &ptr)) {
- g_free (type);
mono_loader_unlock ();
return NULL;
}
projects / mono.git / blobdiff