[aot] Emit EmptyArray<enum>:.cctor () instances since mcs now generates accesses...
authorZoltan Varga <vargaz@gmail.com>
Tue, 3 May 2016 21:37:51 +0000 (17:37 -0400)
committerZoltan Varga <vargaz@gmail.com>
Tue, 3 May 2016 21:37:51 +0000 (17:37 -0400)
mono/mini/aot-compiler.c

index 318c4293d01da0b7c00f2b80c8beaaba4db9fb07..167c06d95469ccdd8b3813425af33ecc9b9ea9c5 100644 (file)
@@ -7812,7 +7812,7 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
                                MonoClass *klass = patch_info->data.field->parent;
 
                                /* The .cctor needs to run at runtime. */
-                               if (klass->generic_class && !mono_generic_context_is_sharable (&klass->generic_class->context, FALSE) && mono_class_get_cctor (klass))
+                               if (klass->generic_class && !mono_generic_context_is_sharable_full (&klass->generic_class->context, FALSE, FALSE) && mono_class_get_cctor (klass))
                                        add_extra_method_with_depth (acfg, mono_class_get_cctor (klass), depth + 1);
                                break;
                        }