[mono][aot] Emit cctor instantiations for classes referenced by gshared methods....

diff --git a/src/mono/mono/mini/aot-compiler.c b/src/mono/mono/mini/aot-compiler.c
index 16dd94136085701b2b182f67e4c1a8ba4383d71f..cfe88c2fb410b2ce22bbfd6cba8e85ab0ea581ad 100644 (file)
--- a/src/mono/mono/mini/aot-compiler.c
+++ b/src/mono/mono/mini/aot-compiler.c
@@ -9148,11 +9148,16 @@ add_referenced_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, int depth)
                }
                break;
        }
+       case MONO_PATCH_INFO_CLASS:
        case MONO_PATCH_INFO_VTABLE: {
                MonoClass *klass = patch_info->data.klass;
 
                if (mono_class_is_ginst (klass) && !mini_class_is_generic_sharable (klass))
                        add_generic_class_with_depth (acfg, klass, depth + 5, "vtable");
+
+               /* The .cctor needs to run at runtime. */
+               if (mono_class_is_ginst (klass) && !mono_generic_context_is_sharable_full (&mono_class_get_generic_class (klass)->context, FALSE, FALSE) && mono_class_get_cctor (klass))
+                       add_extra_method_with_depth (acfg, mono_class_get_cctor (klass), depth + 1);
                break;
        }
        case MONO_PATCH_INFO_SFLDA: {