* metadata.c (mono_type_create_from_typespec_full): Fix caching of types.

svn path=/trunk/mono/; revision=56041

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 8a1678f94b18703292ea4ece8127e0de0aa1359e..d3fff80cf4bf3abde222024c85e25827aabc6290 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25  Raja R Harinath  <rharinath@novell.com>
+
+       * metadata.c (mono_type_create_from_typespec_full): Fix caching of types.
+
 2006-01-25  Ankit Jain  <jankit@novell.com>
 
        * metadata-internals.h (mono_generic_params_with_ambiguous_names): Add declaration and

diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c
index e0d53d7895a627eee4cc22696324743f3cafdf45..e125f6752b1ae711e0d1c3d6dee870fc504280cc 100644 (file)
--- a/mono/metadata/metadata.c
+++ b/mono/metadata/metadata.c
@@ -1856,7 +1856,10 @@ select_container (MonoGenericContainer *gc, MonoTypeEnum type)
        if (!gc)
                return NULL;
 
-       if (type == MONO_TYPE_VAR && gc->parent)
+       gboolean is_var = (type == MONO_TYPE_VAR);
+       g_assert (is_var || type == MONO_TYPE_MVAR);
+
+       if (is_var && gc->parent)
                /*
                 * The current MonoGenericContainer is a generic method -> its `parent'
                 * points to the containing class'es container.
@@ -1866,7 +1869,7 @@ select_container (MonoGenericContainer *gc, MonoTypeEnum type)
        /*
         * Ensure that we have the correct type of GenericContainer.
         */
-       g_assert ((type == MONO_TYPE_VAR) == !gc->is_method);
+       g_assert (is_var == !gc->is_method);
 
        return gc;
 }
@@ -3695,13 +3698,13 @@ mono_type_create_from_typespec_full (MonoImage *image, MonoGenericContext *gener
 
        if (type && type->type == MONO_TYPE_GENERICINST && type->data.generic_class->inst->is_open) {
                MonoType *gtype = find_generic_param (type->data.generic_class, gc ? gc->is_method : FALSE);
-               gc = select_container (gc, gtype->type == MONO_TYPE_MVAR);
+               gc = select_container (gc, gtype->type);
                if (gtype->data.generic_param->owner != gc)
                        type = NULL;
        }
 
        if (type && (type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR)) {
-               gc = select_container (gc, type->type == MONO_TYPE_MVAR);
+               gc = select_container (gc, type->type);
                if (gc) {
                        /* Use the one already cached in the container, if it exists. Otherwise, ensure that it's created */
                        type = gc->types ? gc->types [type->data.generic_param->num] : NULL;
@@ -3735,7 +3738,7 @@ mono_type_create_from_typespec_full (MonoImage *image, MonoGenericContext *gener
 
        type = g_new0 (MonoType, 1);
 
-       if (!cache_type)
+       if (cache_type)
                g_hash_table_insert (image->typespec_cache, GUINT_TO_POINTER (type_spec), type);
 
        if (*ptr == MONO_TYPE_BYREF) {