From 3cfd40cccecd8ee2e8c3ed6c34d90dcbeccec195 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Fri, 15 Sep 2017 10:27:44 -0400 Subject: [PATCH 1/1] [class] Mark mono_class_from_generic_parameter external only Runtime should use mono_class_from_generic_parameter_internal --- mono/metadata/class.h | 1 + mono/mini/aot-compiler.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mono/metadata/class.h b/mono/metadata/class.h index f79cd9bff99..565dac59e4f 100644 --- a/mono/metadata/class.h +++ b/mono/metadata/class.h @@ -45,6 +45,7 @@ mono_class_from_typeref (MonoImage *image, uint32_t type_token); MONO_API MonoClass * mono_class_from_typeref_checked (MonoImage *image, uint32_t type_token, MonoError *error); +MONO_RT_EXTERNAL_ONLY MONO_API MonoClass * mono_class_from_generic_parameter (MonoGenericParam *param, MonoImage *image, mono_bool is_mvar); diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index 125110303ad..6b91543a56b 100644 --- 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); -- 2.25.1