From f2dc087948dbcd319f276b6800c5496073d9d0a0 Mon Sep 17 00:00:00 2001 From: vkargov Date: Thu, 11 May 2017 09:33:41 -0700 Subject: [PATCH] [jit] Keep unwind info in the domain's memory pool. (#4825) --- mono/mini/mini-runtime.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c index 55275e0cade..a9d42e691d6 100644 --- a/mono/mini/mini-runtime.c +++ b/mono/mini/mini-runtime.c @@ -496,6 +496,13 @@ mono_tramp_info_register_internal (MonoTrampInfo *info, MonoDomain *domain, gboo if (info->unwind_ops) { copy->uw_info = mono_unwind_ops_encode (info->unwind_ops, ©->uw_info_len); copy->owns_uw_info = TRUE; + if (domain) { + /* Move unwind info into the domain's memory pool so that it is removed once the domain is released. */ + guint8 *temp = copy->uw_info; + copy->uw_info = mono_domain_alloc (domain, copy->uw_info_len); + memcpy (copy->uw_info, temp, copy->uw_info_len); + g_free (temp); + } } else { /* Trampolines from aot have the unwind ops already encoded */ copy->uw_info = info->uw_info; -- 2.11.4.GIT