2008-11-28 Rodrigo Kumpera <rkumpera@novell.com>

[mono.git] / mono / metadata / reflection.c

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 240bcd0c4d54cc9ca66d9e3cc1bd50aa2277c502..09903644eda911f6ff7caaa00febe1d200abe71b 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -822,12 +822,6 @@ encode_locals (MonoDynamicImage *assembly, MonoReflectionILGen *ilgen)
        int i;
 
        sigbuffer_init (&buf, 32);
-       table = &assembly->tables [MONO_TABLE_STANDALONESIG];
-       idx = table->next_idx ++;
-       table->rows ++;
-       alloc_table (table, table->rows);
-       values = table->values + idx * MONO_STAND_ALONE_SIGNATURE_SIZE;
-
        sigbuffer_add_value (&buf, 0x07);
        sigbuffer_add_value (&buf, nl);
        for (i = 0; i < nl; ++i) {
@@ -841,8 +835,22 @@ encode_locals (MonoDynamicImage *assembly, MonoReflectionILGen *ilgen)
        sig_idx = sigbuffer_add_to_blob_cached (assembly, &buf);
        sigbuffer_free (&buf);
 
+       if (assembly->standalonesig_cache == NULL)
+               assembly->standalonesig_cache = g_hash_table_new (NULL, NULL);
+       idx = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->standalonesig_cache, GUINT_TO_POINTER (sig_idx)));
+       if (idx)
+               return idx;
+
+       table = &assembly->tables [MONO_TABLE_STANDALONESIG];
+       idx = table->next_idx ++;
+       table->rows ++;
+       alloc_table (table, table->rows);
+       values = table->values + idx * MONO_STAND_ALONE_SIGNATURE_SIZE;
+
        values [MONO_STAND_ALONE_SIGNATURE] = sig_idx;
 
+       g_hash_table_insert (assembly->standalonesig_cache, GUINT_TO_POINTER (sig_idx), GUINT_TO_POINTER (idx));
+
        return idx;
 }
 
@@ -2559,7 +2567,8 @@ mono_image_get_fieldref_token (MonoDynamicImage *assembly, MonoReflectionField *
                        type = f->field->type;
        }
        token = mono_image_get_memberref_token (assembly, &f->field->parent->byval_arg, 
-               f->field->name,  fieldref_encode_signature (assembly, type));
+                                                                                       mono_field_get_name (f->field),  
+                                                                                       fieldref_encode_signature (assembly, type));
        g_hash_table_insert (assembly->handleref, f, GUINT_TO_POINTER(token));
        return token;
 }
@@ -4789,6 +4798,8 @@ mono_dynamic_image_free (MonoDynamicImage *image)
                g_hash_table_foreach (di->blob_cache, free_blob_cache_entry, NULL);
                g_hash_table_destroy (di->blob_cache);
        }
+       if (di->standalonesig_cache)
+               g_hash_table_destroy (di->standalonesig_cache);
        for (list = di->array_methods; list; list = list->next) {
                ArrayMethod *am = (ArrayMethod *)list->data;
                g_free (am->sig);
@@ -6026,6 +6037,10 @@ mono_type_get_object (MonoDomain *domain, MonoType *type)
         */
        type = klass->byval_arg.byref == type->byref ? &klass->byval_arg : &klass->this_arg;
 
+       /* void is very common */
+       if (type->type == MONO_TYPE_VOID && domain->typeof_void)
+               return (MonoReflectionType*)domain->typeof_void;
+
        /*
         * If the vtable of the given class was already created, we can use
         * the MonoType from there and avoid all locking and hash table lookups.
@@ -6077,6 +6092,10 @@ mono_type_get_object (MonoDomain *domain, MonoType *type)
 #endif
        res->type = type;
        mono_g_hash_table_insert (domain->type_hash, type, res);
+
+       if (type->type == MONO_TYPE_VOID)
+               MONO_OBJECT_SETREF (domain, typeof_void, res);
+
        mono_domain_unlock (domain);
        return res;
 }
@@ -6172,7 +6191,7 @@ mono_field_get_object (MonoDomain *domain, MonoClass *klass, MonoClassField *fie
        res = (MonoReflectionField *)mono_object_new (domain, monofield_klass);
        res->klass = klass;
        res->field = field;
-       MONO_OBJECT_SETREF (res, name, mono_string_new (domain, field->name));
+       MONO_OBJECT_SETREF (res, name, mono_string_new (domain, mono_field_get_name (field)));
        if (is_field_on_inst (field))
                res->attrs = get_field_on_inst_generic_type (field)->attrs;
        else
@@ -6730,6 +6749,8 @@ _mono_reflection_parse_type (char *name, char **endptr, gboolean is_recursed,
 
        /* last_point separates the namespace from the name */
        last_point = NULL;
+       /* Skips spaces */
+       while (*p == ' ') p++, start++, w++, name++;
 
        while (*p) {
                switch (*p) {
@@ -8397,7 +8418,7 @@ get_field_name_and_type (MonoObject *field, char **name, MonoType **type)
                *type = fb->type->type;
        } else {
                MonoReflectionField *f = (MonoReflectionField *)field;
-               *name = g_strdup (f->field->name);
+               *name = g_strdup (mono_field_get_name (f->field));
                *type = f->field->type;
        }
 }
@@ -9422,8 +9443,6 @@ static MonoClassField*
 fieldbuilder_to_mono_class_field (MonoClass *klass, MonoReflectionFieldBuilder* fb)
 {
        MonoClassField *field;
-       const char *p, *p2;
-       guint32 len, idx;
        MonoType *custom;
 
        field = g_new0 (MonoClassField, 1);
@@ -9440,24 +9459,12 @@ fieldbuilder_to_mono_class_field (MonoClass *klass, MonoReflectionFieldBuilder*
        } else {
                field->type = fb->type->type;
        }
-       if ((fb->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA) && fb->rva_data)
-               field->data = mono_array_addr (fb->rva_data, char, 0); /* FIXME: GC pin array */
        if (fb->offset != -1)
                field->offset = fb->offset;
        field->parent = klass;
        mono_save_custom_attrs (klass->image, field, fb->cattrs);
 
-       if (fb->def_value) {
-               MonoDynamicImage *assembly = (MonoDynamicImage*)klass->image;
-               field->type->attrs |= FIELD_ATTRIBUTE_HAS_DEFAULT;
-               idx = encode_constant (assembly, fb->def_value, &field->def_type);
-               /* Copy the data from the blob since it might get realloc-ed */
-               p = assembly->blob.data + idx;
-               len = mono_metadata_decode_blob_size (p, &p2);
-               len += p2 - p;
-               field->data = g_malloc (len);
-               memcpy ((gpointer)field->data, p, len);
-       }
+       // FIXME: Can't store fb->def_value/RVA, is it needed for field_on_insts ?
 
        return field;
 }
@@ -9733,7 +9740,6 @@ mono_reflection_generic_class_initialize (MonoReflectionGenericClass *type, Mono
                dgclass->field_objects [i] = obj;
 
                if (inflated_field) {
-                       g_free ((char*)inflated_field->data);
                        g_free (inflated_field);
                } else {
                        dgclass->fields [i].name = g_strdup (dgclass->fields [i].name);
@@ -9925,6 +9931,7 @@ typebuilder_setup_fields (MonoClass *klass)
        }
        
        klass->fields = mp_g_new0 (mp, MonoClassField, klass->field.count);
+       klass->field_def_values = mp_g_new0 (mp, MonoFieldDefaultValue, klass->field.count);
 
        for (i = 0; i < klass->field.count; ++i) {
                fb = mono_array_get (tb->fields, gpointer, i);
@@ -9937,7 +9944,7 @@ typebuilder_setup_fields (MonoClass *klass)
                        field->type = fb->type->type;
                }
                if ((fb->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA) && fb->rva_data)
-                       field->data = mono_array_addr (fb->rva_data, char, 0);
+                       klass->field_def_values [i].data = mono_array_addr (fb->rva_data, char, 0);
                if (fb->offset != -1)
                        field->offset = fb->offset;
                field->parent = klass;
@@ -9947,13 +9954,13 @@ typebuilder_setup_fields (MonoClass *klass)
                if (fb->def_value) {
                        MonoDynamicImage *assembly = (MonoDynamicImage*)klass->image;
                        field->type->attrs |= FIELD_ATTRIBUTE_HAS_DEFAULT;
-                       idx = encode_constant (assembly, fb->def_value, &field->def_type);
+                       idx = encode_constant (assembly, fb->def_value, &klass->field_def_values [i].def_type);
                        /* Copy the data from the blob since it might get realloc-ed */
                        p = assembly->blob.data + idx;
                        len = mono_metadata_decode_blob_size (p, &p2);
                        len += p2 - p;
-                       field->data = mono_mempool_alloc (mp, len);
-                       memcpy ((gpointer)field->data, p, len);
+                       klass->field_def_values [i].data = mono_mempool_alloc (mp, len);
+                       memcpy ((gpointer)klass->field_def_values [i].data, p, len);
                }
        }
 
@@ -10488,7 +10495,7 @@ resolve_object (MonoImage *image, MonoObject *obj, MonoClass **handle_class, Mon
                        MonoType *type = mono_class_inflate_generic_type (&klass->byval_arg, context);
                        MonoClass *inflated = mono_class_from_mono_type (type);
 
-                       result = mono_class_get_field_from_name (inflated, fb->handle->name);
+                       result = mono_class_get_field_from_name (inflated, mono_field_get_name (fb->handle));
                        g_assert (result);
                        mono_metadata_free_type (type);
                }
@@ -10569,7 +10576,7 @@ resolve_object (MonoImage *image, MonoObject *obj, MonoClass **handle_class, Mon
                inflated = mono_class_from_mono_type (type);
 
                g_assert (f->fb->handle);
-               result = mono_class_get_field_from_name (inflated, f->fb->handle->name);
+               result = mono_class_get_field_from_name (inflated, mono_field_get_name (f->fb->handle));
                g_assert (result);
                mono_metadata_free_type (type);
                *handle_class = mono_defaults.fieldhandle_class;