From 5b5d0f8a3d2803b5eb8aee1aa2f0262a265ac14e Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 3 May 2016 17:37:51 -0400 Subject: [PATCH] [aot] Emit EmptyArray:.cctor () instances since mcs now generates accesses to EmptyArray.Value for new enum[0] expressions. --- mono/mini/aot-compiler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index 318c4293d01..167c06d9546 100644 --- a/mono/mini/aot-compiler.c +++ b/mono/mini/aot-compiler.c @@ -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; } -- 2.25.1