Merge pull request #3936 from kumpera/monoclass_reorg2

More MonoClass reorg, replace 3 fields with a property bag

diff --combined mono/metadata/class.c
index 163e3b9b2aff4c21655371a6cbc1a2bc9bd7378e,a91a33a4bbfa9b025c34475a9dc7160e5e9782b7..3f54ba7397c04d4e32e998a530b0d2a32b7bfd1c
--- 1/mono/metadata/class.c
--- 2/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@@ -245,9 -245,10 +245,10 @@@ mono_class_from_typeref_checked (MonoIm
                enclosing = mono_class_from_typeref_checked (image, MONO_TOKEN_TYPE_REF | idx, error); 
                return_val_if_nok (error, NULL);
  
-               if (enclosing->nested_classes_inited && enclosing->ext) {
+               MonoClassExt *ext = mono_class_get_ext (enclosing);
+               if (enclosing->nested_classes_inited && ext) {
                        /* Micro-optimization: don't scan the metadata tables if enclosing is already inited */
-                       for (tmp = enclosing->ext->nested_classes; tmp; tmp = tmp->next) {
+                       for (tmp = ext->nested_classes; tmp; tmp = tmp->next) {
                                res = (MonoClass *)tmp->data;
                                if (strcmp (res->name, name) == 0)
                                        return res;
@@@ -2523,7 -2524,8 +2524,8 @@@ mono_class_setup_properties (MonoClass 
        guint32 last;
        int first, count;
  
-       if (klass->ext && klass->ext->properties)
+       MonoClassExt *ext = mono_class_get_ext (klass);
+       if (ext && ext->properties)
                return;
  
        if (mono_class_is_ginst (klass)) {
@@@ -2534,13 -2536,14 +2536,14 @@@
                if (mono_class_set_type_load_failure_causedby_class (klass, gklass, "Generic type definition failed to load"))
                        return;
  
-               properties = mono_class_new0 (klass, MonoProperty, gklass->ext->property.count + 1);
+               MonoClassExt *gext = mono_class_get_ext (gklass);
+               properties = mono_class_new0 (klass, MonoProperty, gext->property.count + 1);
  
-               for (i = 0; i < gklass->ext->property.count; i++) {
+               for (i = 0; i < gext->property.count; i++) {
                        MonoError error;
                        MonoProperty *prop = &properties [i];
  
-                       *prop = gklass->ext->properties [i];
+                       *prop = gext->properties [i];
  
                        if (prop->get)
                                prop->get = mono_class_inflate_generic_method_full_checked (
@@@ -2553,8 -2556,8 +2556,8 @@@
                        prop->parent = klass;
                }
  
-               first = gklass->ext->property.first;
-               count = gklass->ext->property.count;
+               first = gext->property.first;
+               count = gext->property.count;
        } else {
                first = mono_metadata_properties_from_typedef (klass->image, mono_metadata_token_index (klass->type_token) - 1, &last);
                count = last - first;
@@@ -2603,23 -2606,24 +2606,24 @@@
        }
  
        mono_class_alloc_ext (klass);
+       ext = mono_class_get_ext (klass);
  
        mono_image_lock (klass->image);
  
-       if (klass->ext->properties) {
+       if (ext->properties) {
                /* We leak 'properties' which was allocated from the image mempool */
                mono_image_unlock (klass->image);
                return;
        }
  
-       klass->ext->property.first = first;
-       klass->ext->property.count = count;
+       ext->property.first = first;
+       ext->property.count = count;
  
        /* Flush any pending writes as we do double checked locking on klass->ext->properties */
        mono_memory_barrier ();
  
        /* Leave this assignment as the last op in the function */
-       klass->ext->properties = properties;
+       ext->properties = properties;
  
        mono_image_unlock (klass->image);
  }
@@@ -2655,7 -2659,8 +2659,8 @@@ mono_class_setup_events (MonoClass *kla
        guint32 last;
        MonoEvent *events;
  
-       if (klass->ext && klass->ext->events)
+       MonoClassExt *ext = mono_class_get_ext (klass);
+       if (ext && ext->events)
                return;
  
        if (mono_class_is_ginst (klass)) {
@@@ -2666,8 -2671,9 +2671,9 @@@
                if (mono_class_set_type_load_failure_causedby_class (klass, gklass, "Generic type definition failed to load"))
                        return;
  
-               first = gklass->ext->event.first;
-               count = gklass->ext->event.count;
+               MonoClassExt *gext = mono_class_get_ext (gklass);
+               first = gext->event.first;
+               count = gext->event.count;
  
                events = mono_class_new0 (klass, MonoEvent, count);
  
@@@ -2677,7 -2683,7 +2683,7 @@@
                for (i = 0; i < count; i++) {
                        MonoError error;
                        MonoEvent *event = &events [i];
-                       MonoEvent *gevent = &gklass->ext->events [i];
+                       MonoEvent *gevent = &gext->events [i];
  
                        mono_error_init (&error); //since we do conditional calls, we must ensure the default value is ok
  
@@@ -2766,22 -2772,23 +2772,23 @@@
        }
  
        mono_class_alloc_ext (klass);
+       ext = mono_class_get_ext (klass);
  
        mono_image_lock (klass->image);
  
-       if (klass->ext->events) {
+       if (ext->events) {
                mono_image_unlock (klass->image);
                return;
        }
  
-       klass->ext->event.first = first;
-       klass->ext->event.count = count;
+       ext->event.first = first;
+       ext->event.count = count;
  
        /* Flush any pending writes as we do double checked locking on klass->ext.events */
        mono_memory_barrier ();
  
        /* Leave this assignment as the last op in the function */
-       klass->ext->events = events;
+       ext->events = events;
  
        mono_image_unlock (klass->image);
  }
@@@ -3544,8 -3551,6 +3551,8 @@@ setup_interface_offsets (MonoClass *kla
        int num_array_interfaces;
        int is_enumerator = FALSE;
  
 +      mono_loader_lock ();
 +
        mono_class_setup_supertypes (klass);
        /* 
         * get the implicit generic interfaces for either the arrays or for System.Array/InternalEnumerator<T>
@@@ -3706,6 -3711,8 +3713,6 @@@
        }
  
        /* Publish the data */
 -      mono_loader_lock ();
 -
        klass->max_interface_id = max_iid;
        /*
         * We might get called multiple times:
@@@ -3747,9 -3754,9 +3754,9 @@@
                klass->interface_bitmap = bitmap;
  #endif
        }
 +end:
        mono_loader_unlock ();
  
 -end:
        g_free (interfaces_full);
        g_free (interface_offsets_full);
        g_free (array_interfaces);
@@@ -6765,9 -6772,10 +6772,10 @@@ mono_bounded_array_class_get (MonoClas
                mono_class_set_failure (klass, mono_error_box (&prepared_error, klass->image));
                mono_error_cleanup (&prepared_error);
        } else if (eclass->enumtype && !mono_class_enum_basetype (eclass)) {
-               if (!eclass->ref_info_handle || eclass->wastypebuilder) {
+               guint32 ref_info_handle = mono_class_get_ref_info_handle (eclass);
+               if (!ref_info_handle || eclass->wastypebuilder) {
                        g_warning ("Only incomplete TypeBuilder objects are allowed to be an enum without base_type");
-                       g_assert (eclass->ref_info_handle && !eclass->wastypebuilder);
+                       g_assert (ref_info_handle && !eclass->wastypebuilder);
                }
                /* element_size -1 is ok as this is not an instantitable type*/
                klass->sizes.element_size = -1;
@@@ -7135,23 -7143,25 +7143,25 @@@ mono_class_get_field_default_value (Mon
  
        g_assert (field->type->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT);
  
-       if (!klass->ext || !klass->ext->field_def_values) {
+       MonoClassExt *ext = mono_class_get_ext (klass);
+       if (!ext || !ext->field_def_values) {
                MonoFieldDefaultValue *def_values;
  
                mono_class_alloc_ext (klass);
+               ext = mono_class_get_ext (klass);
  
                def_values = (MonoFieldDefaultValue *)mono_class_alloc0 (klass, sizeof (MonoFieldDefaultValue) * mono_class_get_field_count (klass));
  
                mono_image_lock (klass->image);
                mono_memory_barrier ();
-               if (!klass->ext->field_def_values)
-                       klass->ext->field_def_values = def_values;
+               if (!ext->field_def_values)
+                       ext->field_def_values = def_values;
                mono_image_unlock (klass->image);
        }
  
        field_index = mono_field_get_index (field);
                
-       if (!klass->ext->field_def_values [field_index].data) {
+       if (!ext->field_def_values [field_index].data) {
                cindex = mono_metadata_get_constant_index (field->parent->image, mono_class_get_field_token (field), 0);
                if (!cindex)
                        return NULL;
@@@ -7159,20 -7169,21 +7169,21 @@@
                g_assert (!(field->type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA));
  
                mono_metadata_decode_row (&field->parent->image->tables [MONO_TABLE_CONSTANT], cindex - 1, constant_cols, MONO_CONSTANT_SIZE);
-               klass->ext->field_def_values [field_index].def_type = (MonoTypeEnum)constant_cols [MONO_CONSTANT_TYPE];
-               klass->ext->field_def_values [field_index].data = (const char *)mono_metadata_blob_heap (field->parent->image, constant_cols [MONO_CONSTANT_VALUE]);
+               ext->field_def_values [field_index].def_type = (MonoTypeEnum)constant_cols [MONO_CONSTANT_TYPE];
+               ext->field_def_values [field_index].data = (const char *)mono_metadata_blob_heap (field->parent->image, constant_cols [MONO_CONSTANT_VALUE]);
        }
  
-       *def_type = klass->ext->field_def_values [field_index].def_type;
-       return klass->ext->field_def_values [field_index].data;
+       *def_type = ext->field_def_values [field_index].def_type;
+       return ext->field_def_values [field_index].data;
  }
  
  static int
  mono_property_get_index (MonoProperty *prop)
  {
-       int index = prop - prop->parent->ext->properties;
+       MonoClassExt *ext = mono_class_get_ext (prop->parent);
+       int index = prop - ext->properties;
  
-       g_assert (index >= 0 && index < prop->parent->ext->property.count);
+       g_assert (index >= 0 && index < ext->property.count);
  
        return index;
  }
@@@ -7197,10 -7208,11 +7208,11 @@@ mono_class_get_property_default_value (
         */
  
        if (image_is_dynamic (klass->image)) {
+               MonoClassExt *ext = mono_class_get_ext (klass);
                int prop_index = mono_property_get_index (property);
-               if (klass->ext->prop_def_values && klass->ext->prop_def_values [prop_index].data) {
-                       *def_type = klass->ext->prop_def_values [prop_index].def_type;
-                       return klass->ext->prop_def_values [prop_index].data;
+               if (ext->prop_def_values && ext->prop_def_values [prop_index].data) {
+                       *def_type = ext->prop_def_values [prop_index].def_type;
+                       return ext->prop_def_values [prop_index].data;
                }
                return NULL;
        }
@@@ -7220,10 -7232,11 +7232,11 @@@ mono_class_get_event_token (MonoEvent *
        int i;
  
        while (klass) {
-               if (klass->ext) {
-                       for (i = 0; i < klass->ext->event.count; ++i) {
-                               if (&klass->ext->events [i] == event)
-                                       return mono_metadata_make_token (MONO_TABLE_EVENT, klass->ext->event.first + i + 1);
+               MonoClassExt *ext = mono_class_get_ext (klass);
+               if (ext) {
+                       for (i = 0; i < ext->event.count; ++i) {
+                               if (&ext->events [i] == event)
+                                       return mono_metadata_make_token (MONO_TABLE_EVENT, ext->event.first + i + 1);
                        }
                }
                klass = klass->parent;
@@@ -7271,9 -7284,10 +7284,10 @@@ mono_class_get_property_token (MonoProp
                MonoProperty* p;
                int i = 0;
                gpointer iter = NULL;
+               MonoClassExt *ext = mono_class_get_ext (klass);
                while ((p = mono_class_get_properties (klass, &iter))) {
-                       if (&klass->ext->properties [i] == prop)
-                               return mono_metadata_make_token (MONO_TABLE_PROPERTY, klass->ext->property.first + i + 1);
+                       if (&ext->properties [i] == prop)
+                               return mono_metadata_make_token (MONO_TABLE_PROPERTY, ext->property.first + i + 1);
                        
                        i ++;
                }
@@@ -8370,7 -8384,7 +8384,7 @@@ mono_class_is_assignable_from (MonoClas
                }
  
                /* interface_offsets might not be set for dynamic classes */
-               if (oklass->ref_info_handle && !oklass->interface_bitmap) {
+               if (mono_class_get_ref_info_handle (oklass) && !oklass->interface_bitmap) {
                        /* 
                         * oklass might be a generic type parameter but they have 
                         * interface_offsets set.
@@@ -9117,7 -9131,7 +9131,7 @@@ mono_class_num_properties (MonoClass *k
  {
        mono_class_setup_properties (klass);
  
-       return klass->ext->property.count;
+       return mono_class_get_ext (klass)->property.count;
  }
  
  /**
@@@ -9131,7 -9145,7 +9145,7 @@@ mono_class_num_events (MonoClass *klass
  {
        mono_class_setup_events (klass);
  
-       return klass->ext->event.count;
+       return mono_class_get_ext (klass)->event.count;
  }
  
  /**
@@@ -9316,9 -9330,10 +9330,10 @@@ mono_class_get_properties (MonoClass* k
                return NULL;
        if (!*iter) {
                mono_class_setup_properties (klass);
+               MonoClassExt *ext = mono_class_get_ext (klass);
                /* start from the first */
-               if (klass->ext->property.count) {
-                       *iter = &klass->ext->properties [0];
+               if (ext->property.count) {
+                       *iter = &ext->properties [0];
                        return (MonoProperty *)*iter;
                } else {
                        /* no fields */
@@@ -9327,7 -9342,8 +9342,8 @@@
        }
        property = (MonoProperty *)*iter;
        property++;
-       if (property < &klass->ext->properties [klass->ext->property.count]) {
+       MonoClassExt *ext = mono_class_get_ext (klass);
+       if (property < &ext->properties [ext->property.count]) {
                *iter = property;
                return (MonoProperty *)*iter;
        }
@@@ -9354,9 -9370,10 +9370,10 @@@ mono_class_get_events (MonoClass* klass
                return NULL;
        if (!*iter) {
                mono_class_setup_events (klass);
+               MonoClassExt *ext = mono_class_get_ext (klass);
                /* start from the first */
-               if (klass->ext->event.count) {
-                       *iter = &klass->ext->events [0];
+               if (ext->event.count) {
+                       *iter = &ext->events [0];
                        return (MonoEvent *)*iter;
                } else {
                        /* no fields */
@@@ -9365,7 -9382,8 +9382,8 @@@
        }
        event = (MonoEvent *)*iter;
        event++;
-       if (event < &klass->ext->events [klass->ext->event.count]) {
+       MonoClassExt *ext = mono_class_get_ext (klass);
+       if (event < &ext->events [ext->event.count]) {
                *iter = event;
                return (MonoEvent *)*iter;
        }
@@@ -9463,7 -9481,7 +9481,7 @@@ setup_nested_types (MonoClass *klass
  
        mono_memory_barrier ();
        if (!klass->nested_classes_inited) {
-               klass->ext->nested_classes = nested_classes;
+               mono_class_get_ext (klass)->nested_classes = nested_classes;
                mono_memory_barrier ();
                klass->nested_classes_inited = TRUE;
        }
@@@ -9495,10 -9513,11 +9513,11 @@@ mono_class_get_nested_types (MonoClass
                setup_nested_types (klass);
  
        if (!*iter) {
+               MonoClassExt *ext = mono_class_get_ext (klass);
                /* start from the first */
-               if (klass->ext && klass->ext->nested_classes) {
-                       *iter = klass->ext->nested_classes;
-                       return (MonoClass *)klass->ext->nested_classes->data;
+               if (ext && ext->nested_classes) {
+                       *iter = ext->nested_classes;
+                       return (MonoClass *)ext->nested_classes->data;
                } else {
                        /* no nested types */
                        return NULL;
@@@ -9637,28 -9656,30 +9656,30 @@@ mono_field_get_rva (MonoClassField *fie
  
        g_assert (field->type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA);
  
-       if (!klass->ext || !klass->ext->field_def_values) {
+       MonoClassExt *ext = mono_class_get_ext (klass);
+       if (!ext || !ext->field_def_values) {
                mono_class_alloc_ext (klass);
+               ext = mono_class_get_ext (klass);
  
                field_def_values = (MonoFieldDefaultValue *)mono_class_alloc0 (klass, sizeof (MonoFieldDefaultValue) * mono_class_get_field_count (klass));
  
                mono_image_lock (klass->image);
-               if (!klass->ext->field_def_values)
-                       klass->ext->field_def_values = field_def_values;
+               if (!ext->field_def_values)
+                       ext->field_def_values = field_def_values;
                mono_image_unlock (klass->image);
        }
  
        field_index = mono_field_get_index (field);
                
-       if (!klass->ext->field_def_values [field_index].data && !image_is_dynamic (klass->image)) {
+       if (!ext->field_def_values [field_index].data && !image_is_dynamic (klass->image)) {
                int first_field_idx = mono_class_get_first_field_idx (klass);
                mono_metadata_field_info (field->parent->image, first_field_idx + field_index, NULL, &rva, NULL);
                if (!rva)
                        g_warning ("field %s in %s should have RVA data, but hasn't", mono_field_get_name (field), field->parent->name);
-               klass->ext->field_def_values [field_index].data = mono_image_rva_map (field->parent->image, rva);
+               ext->field_def_values [field_index].data = mono_image_rva_map (field->parent->image, rva);
        }
  
-       return klass->ext->field_def_values [field_index].data;
+       return ext->field_def_values [field_index].data;
  }
  
  /**
@@@ -10631,14 -10652,14 +10652,14 @@@ mono_class_alloc_ext (MonoClass *klass
  {
        MonoClassExt *ext;
  
-       if (klass->ext)
+       if (mono_class_get_ext (klass))
                return;
  
        ext = (MonoClassExt *)mono_class_alloc0 (klass, sizeof (MonoClassExt));
        mono_image_lock (klass->image);
        mono_memory_barrier ();
-       if (!klass->ext)
-               klass->ext = ext;
+       if (!mono_class_get_ext (klass))
+               mono_class_set_ext (klass, ext);
        class_ext_size += sizeof (MonoClassExt);
        ++class_ext_count;
        mono_image_unlock (klass->image);