From 60be1d5ef261b09e3983bd61f2c6145c237430cf Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 30 Aug 2011 16:39:47 +0200 Subject: [PATCH] Fix the sdb changes made by 06ff2031 --- mono/mini/debugger-agent.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c index 8d8e33fe17c..fc9c6ead97f 100644 --- a/mono/mini/debugger-agent.c +++ b/mono/mini/debugger-agent.c @@ -2078,6 +2078,7 @@ gboolean mono_debugger_agent_thread_interrupt (void *sigctx, MonoJitInfo *ji) { DebuggerTlsData *tls; + gboolean res; if (!inited) return FALSE; @@ -2160,8 +2161,13 @@ mono_debugger_agent_thread_interrupt (void *sigctx, MonoJitInfo *ji) } if (data.last_frame_set) { memcpy (&tls->async_last_frame, &data.last_frame, sizeof (StackFrameInfo)); - g_assert (mono_thread_state_init_from_monoctx (&tls->async_state, sigctx)); - g_assert (mono_thread_state_init_from_monoctx (&tls->context, sigctx)); + res = mono_thread_state_init_from_sigctx (&tls->async_state, &ctx); + g_assert (res); + mono_thread_state_init_from_sigctx (&tls->context, &ctx); + g_assert (res); + + memcpy (&tls->async_state.ctx, &data.ctx, sizeof (MonoContext)); + tls->async_state.unwind_data [MONO_UNWIND_DATA_LMF] = data.lmf; } else { tls->async_state.valid = FALSE; } -- 2.11.4.GIT