[interp] use helper function to check if generic inst is a value type
authorBernhard Urban <bernhard.urban@xamarin.com>
Wed, 17 May 2017 11:40:58 +0000 (13:40 +0200)
committerBernhard Urban <bernhard.urban@xamarin.com>
Wed, 17 May 2017 15:36:43 +0000 (17:36 +0200)
mono/mini/interp/interp.c

index 7b26797c9b3dd555038b3cbf3b958696cf81153d..7392feb1298ef2a91c7373f797aef24dbd6a7c70 100644 (file)
@@ -400,9 +400,7 @@ stackval_from_data (MonoType *type, stackval *result, char *data, gboolean pinvo
                        mono_value_copy (result->data.vt, data, type->data.klass);
                return;
        case MONO_TYPE_GENERICINST: {
-               MonoClass *container_class = type->data.generic_class->container_class;
-
-               if (container_class->valuetype && !container_class->enumtype) {
+               if (mono_type_generic_inst_is_valuetype (type)) {
                        mono_value_copy (result->data.vt, data, mono_class_from_mono_type (type));
                        return;
                }