[aot] Register tramp infos when loading trampolines in aot.

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 30bdfa7adb45f5619b2b8c909fb32a0ee0ce95be..c39633e2910092a0affaa37c63e33eb844f56f0c 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -6194,7 +6194,7 @@ emit_trampoline_full (MonoAotCompile *acfg, int got_offset, MonoTrampInfo *info,
 static G_GNUC_UNUSED void
 emit_trampoline (MonoAotCompile *acfg, int got_offset, MonoTrampInfo *info)
 {
-       emit_trampoline_full (acfg, got_offset, info, FALSE);
+       emit_trampoline_full (acfg, got_offset, info, TRUE);
 }
 
 static void

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index a8a20432082a2a2f61ff3f58125d89d0eb431884..7ddc13cacfe963a49035e3707c5300e2f496d8ec 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -4628,7 +4628,13 @@ mono_aot_get_trampoline_full (const char *name, MonoTrampInfo **out_tinfo)
 gpointer
 mono_aot_get_trampoline (const char *name)
 {
-       return mono_aot_get_trampoline_full (name, NULL);
+       MonoTrampInfo *out_tinfo;
+       gpointer code;
+
+       code =  mono_aot_get_trampoline_full (name, &out_tinfo);
+       mono_tramp_info_register (out_tinfo);
+
+       return code;
 }
 
 #ifdef MONOTOUCH