Merge pull request #4444 from lateralusX/jlorenss/windows-unwind-info

[mono.git] / mono / mini / mini-runtime.c

diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index 9336b94f2d2bcc0f5935fa09163f6f5bfb9e0098..d573c31ce04be54923e55f37bb708299940016df 100644 (file)
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -505,6 +505,10 @@ mono_tramp_info_register (MonoTrampInfo *info, MonoDomain *domain)
        mono_save_trampoline_xdebug_info (info);
        mono_lldb_save_trampoline_info (info);
 
+#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
+       mono_arch_unwindinfo_install_tramp_unwind_info (info->unwind_ops, info->code, info->code_size);
+#endif
+
        /* Only register trampolines that have unwind infos */
        if (mono_get_root_domain () && copy->uw_info)
                register_trampoline_jit_info (domain, copy);