From: Ivan Povazan <55002338+ivanpovazan@users.noreply.github.com> Date: Tue, 21 Jun 2022 15:28:40 +0000 (+0200) Subject: [mono] Do not generate impossible instantiations for constrained generics in Mono... X-Git-Tag: accepted/tizen/unified/riscv/20231226.055536~8423 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3affc68d31fd4623efd9d4188f449a2b128574a1;p=platform%2Fupstream%2Fdotnet%2Fruntime.git [mono] Do not generate impossible instantiations for constrained generics in Mono AOT (#70838) This change improves the AOTed code size by reducing the number of generated methods for generics. Fixes https://github.com/dotnet/runtime/issues/54850 --- diff --git a/src/mono/mono/mini/aot-compiler.c b/src/mono/mono/mini/aot-compiler.c index fac7efd..a4b1e02 100644 --- a/src/mono/mono/mini/aot-compiler.c +++ b/src/mono/mono/mini/aot-compiler.c @@ -12307,6 +12307,52 @@ emit_unwind_info_sections_win32 (MonoAotCompile *acfg, const char *function_star } #endif +/** + * should_emit_extra_method_for_generics: + * \param method The method to check for generic parameters. + * \param reference_type Specifies which constraint type to look for (TRUE - reference type, FALSE - value type). + * + * Tests whether a generic method or a method of a generic type requires generation of extra methods based on its constraints. + * If a method has at least one generic parameter constrained to a reference type, then REF shared method must be generated. + * On the other hand, if a method has at least one generic parameter constrained to a value type, then GSHAREDVT method must be generated. + * A special case, when extra methods are always generated, is for generic methods of generic types. + * + * Returns: TRUE - extra method should be generated, otherwise FALSE + */ +static gboolean +should_emit_extra_method_for_generics (MonoMethod *method, gboolean reference_type) +{ + MonoGenericContainer *gen_container = NULL; + MonoGenericParam *gen_param = NULL; + unsigned int gen_param_count; + + if (method->is_generic && mono_class_is_gtd (method->klass)) { + // TODO: This is rarely encountered and would increase the complexity of covering such cases. + // For now always generate extra methods. + return TRUE; + } else if (method->is_generic) { + gen_container = mono_method_get_generic_container (method); + gen_param_count = mono_method_signature_internal (method)->generic_param_count; + } else if (mono_class_is_gtd (method->klass)) { + gen_container = mono_class_get_generic_container (method->klass); + gen_param_count = gen_container->type_argc; + } else { + return FALSE; // Not a generic. + } + g_assert (gen_param_count != 0); + + // Inverted logic - for example: + // if we are checking whether REF shared method should be generated (reference_type = TRUE), + // we are looking for at least one constraint which is not a value type constraint. + gboolean should_emit = FALSE; + unsigned int gen_constraint_mask = reference_type ? GENERIC_PARAMETER_ATTRIBUTE_VALUE_TYPE_CONSTRAINT : GENERIC_PARAMETER_ATTRIBUTE_REFERENCE_TYPE_CONSTRAINT; + for (unsigned int i = 0; i < gen_param_count; i++) { + gen_param = mono_generic_container_get_param (gen_container, i); + should_emit |= !(gen_param->info.flags & gen_constraint_mask); + } + return should_emit; +} + static gboolean should_emit_gsharedvt_method (MonoAotCompile *acfg, MonoMethod *method) { @@ -12318,7 +12364,7 @@ should_emit_gsharedvt_method (MonoAotCompile *acfg, MonoMethod *method) if (acfg->image == mono_get_corlib () && !strcmp (m_class_get_name (method->klass), "Volatile")) /* Read/Write are not needed and cause JIT failures */ return FALSE; - return TRUE; + return should_emit_extra_method_for_generics (method, FALSE); } static gboolean @@ -12368,7 +12414,7 @@ collect_methods (MonoAotCompile *acfg) } */ - if (method->is_generic || mono_class_is_gtd (method->klass)) { + if (should_emit_extra_method_for_generics (method, TRUE)) { /* Compile the ref shared version instead */ method = mini_get_shared_method_full (method, SHARE_MODE_NONE, error); if (!method) {