Add two wrappers which are used to transition between normal and gsharedvt code.

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

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 0c3d2364822f6823828307a9b66db80e72c149dd..6041831108c75291c82ed64078c218d921a62547 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -2750,15 +2750,10 @@ mono_image_get_fieldref_token (MonoDynamicImage *assembly, MonoObject *f, MonoCl
        if (token)
                return token;
 
-       if (field->parent->generic_class && field->parent->generic_class->container_class && field->parent->generic_class->container_class->fields) {
-               int index = field - field->parent->fields;
-               type = field->parent->generic_class->container_class->fields [index].type;
-       } else {
-               if (is_field_on_inst (field))
-                       type = get_field_on_inst_generic_type (field);
-               else
-                       type = mono_field_get_type (field);
-       }
+       if (is_field_on_inst (field))
+               type = get_field_on_inst_generic_type (field);
+       else
+               type = mono_field_get_type (field);
        token = mono_image_get_memberref_token (assembly, &field->parent->byval_arg,
                                                                                        mono_field_get_name (field),
                                                                                        fieldref_encode_signature (assembly, field->parent->image, type));