2009-02-05 Zoltan Varga <vargaz@gmail.com>

	* class.c marshal.c: Use mono_class_enum_basetype () instead of accessing
	klass->enum_basetype directly.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 7d50a3cb6f9a1d9381970a680ae1d060d90e0909..a53d65ff91942090928caf273efc4baffe61cd59 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,6 +1,6 @@
 2009-02-05  Zoltan Varga  <vargaz@gmail.com>
 
-       * class.c: Use  mono_class_enum_basetype () instead of accessing 
+       * class.c marshal.c: Use mono_class_enum_basetype () instead of accessing 
        klass->enum_basetype directly.
 
        * verify.c metadata.c object.c icall.c reflection.c: Use 

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 09a493a41b2e6845edd54f48276a55d676bad919..b9b77d5919e2a28576d67d22cbb9d21652421b34 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -1471,7 +1471,7 @@ handle_enum:
                return CEE_LDIND_R8;
        case MONO_TYPE_VALUETYPE:
                if (type->data.klass->enumtype) {
-                       type = type->data.klass->enum_basetype;
+                       type = mono_class_enum_basetype (type->data.klass);
                        goto handle_enum;
                }
                return CEE_LDOBJ;
@@ -1525,7 +1525,7 @@ handle_enum:
                return CEE_STIND_R8;
        case MONO_TYPE_VALUETYPE:
                if (type->data.klass->enumtype) {
-                       type = type->data.klass->enum_basetype;
+                       type = mono_class_enum_basetype (type->data.klass);
                        goto handle_enum;
                }
                return CEE_STOBJ;
@@ -2394,7 +2394,7 @@ emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object)
                                int src_var, dst_var;
 
                                if (ftype->data.klass->enumtype) {
-                                       ftype = ftype->data.klass->enum_basetype;
+                                       ftype = mono_class_enum_basetype (ftype->data.klass);
                                        goto handle_enum;
                                }
 
@@ -5075,7 +5075,7 @@ handle_enum:
                        /* fall through */
                case MONO_TYPE_VALUETYPE:
                        if (type == MONO_TYPE_VALUETYPE && t->data.klass->enumtype) {
-                               type = t->data.klass->enum_basetype->type;
+                               type = mono_class_enum_basetype (t->data.klass)->type;
                                goto handle_enum;
                        }
                        mono_mb_emit_byte (mb, CEE_LDIND_I);
@@ -8783,7 +8783,7 @@ mono_marshal_emit_native_wrapper (MonoImage *image, MonoMethodBuilder *mb, MonoM
                        case MONO_TYPE_VALUETYPE:
                                klass = sig->ret->data.klass;
                                if (klass->enumtype) {
-                                       type = sig->ret->data.klass->enum_basetype->type;
+                                       type = mono_class_enum_basetype (sig->ret->data.klass)->type;
                                        goto handle_enum;
                                }
                                emit_marshal (&m, 0, sig->ret, spec, 0, NULL, MARSHAL_ACTION_CONV_RESULT);
@@ -11663,7 +11663,7 @@ mono_type_native_stack_size (MonoType *t, guint32 *align)
                MonoClass *klass = mono_class_from_mono_type (t);
 
                if (klass->enumtype)
-                       return mono_type_native_stack_size (klass->enum_basetype, align);
+                       return mono_type_native_stack_size (mono_class_enum_basetype (klass), align);
                else {
                        size = mono_class_native_size (klass, align);
                        *align = *align + 3;