From 03f960ca712599c833af84407f6eb98fce348f0e Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 14 Apr 2009 11:04:11 +0000 Subject: [PATCH] 2009-04-14 Zoltan Varga * mini-trampolines.c (mono_magic_trampoline): Fix the build. svn path=/trunk/mono/; revision=131654 --- mono/mini/ChangeLog | 2 ++ mono/mini/mini-trampolines.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 8e2d4732e02..e9fedda91a2 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,7 @@ 2009-04-14 Zoltan Varga + * mini-trampolines.c (mono_magic_trampoline): Fix the build. + * liveness.c (visit_bb): Remove a needless assert. 2009-04-13 Zoltan Varga diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c index a565e35c0f0..5df33a1f371 100644 --- a/mono/mini/mini-trampolines.c +++ b/mono/mini/mini-trampolines.c @@ -178,7 +178,9 @@ mono_magic_trampoline (gssize *regs, guint8 *code, MonoMethod *m, guint8* tramp) MonoMethod *generic_virtual = NULL; int context_used; gboolean proxy = FALSE; +#ifdef MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE gboolean need_rgctx_tramp = FALSE; +#endif #if MONO_ARCH_COMMON_VTABLE_TRAMPOLINE if (m == MONO_FAKE_VTABLE_METHOD) { @@ -700,7 +702,9 @@ mono_delegate_trampoline (gssize *regs, guint8 *code, gpointer *tramp_data, guin MonoMethod *m; MonoMethod *method = NULL; gboolean multicast, callvirt; +#ifdef MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE gboolean need_rgctx_tramp = FALSE; +#endif MonoMethod *invoke = tramp_data [0]; guint8 *impl_this = tramp_data [1]; guint8 *impl_nothis = tramp_data [2]; @@ -761,8 +765,10 @@ mono_delegate_trampoline (gssize *regs, guint8 *code, gpointer *tramp_data, guin } } +#ifdef MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE if (need_rgctx_tramp) delegate->method_ptr = mono_create_static_rgctx_trampoline (method, delegate->method_ptr); +#endif multicast = ((MonoMulticastDelegate*)delegate)->prev != NULL; if (!multicast && !callvirt) { -- 2.11.4.GIT