Merge pull request #5560 from kumpera/wasm-work-p3

[mono.git] / mono / mini / aot-compiler.c

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index c2dd1b28eebe419ab43ba79e3b25c250012db779..6b91543a56b6bbfd9e7f6a4c32f6bdb29911f289 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -2897,7 +2897,7 @@ encode_klass_ref_inner (MonoAotCompile *acfg, MonoClass *klass, guint8 *buf, gui
                if (par->gshared_constraint) {
                        MonoGSharedGenericParam *gpar = (MonoGSharedGenericParam*)par;
                        encode_type (acfg, par->gshared_constraint, p, &p);
-                       encode_klass_ref (acfg, mono_class_from_generic_parameter (gpar->parent, NULL, klass->byval_arg.type == MONO_TYPE_MVAR), p, &p);
+                       encode_klass_ref (acfg, mono_class_from_generic_parameter_internal (gpar->parent), p, &p);
                } else {
                        encode_value (klass->byval_arg.type, p, &p);
                        encode_value (mono_type_get_generic_param_num (&klass->byval_arg), p, &p);
@@ -7917,6 +7917,7 @@ compile_method (MonoAotCompile *acfg, MonoMethod *method)
 
        g_hash_table_insert (acfg->method_to_cfg, cfg->orig_method, cfg);
 
+       /* Update global stats while holding a lock. */
        mono_update_jit_stats (cfg);
 
        /*