From 75a7c3219c4ada47633e78d9f63466369805a4ed Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 20 May 2014 20:01:08 +0200 Subject: [PATCH] [runtime] Clean up an #ifdef block. --- mono/mini/mini-trampolines.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c index 537a0bbfdcc..6e56ed5d2a0 100644 --- a/mono/mini/mini-trampolines.c +++ b/mono/mini/mini-trampolines.c @@ -1046,6 +1046,7 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr MonoError err; MonoMethodSignature *sig; gpointer addr, compiled_method; + gboolean is_remote = FALSE; trampoline_calls ++; @@ -1064,14 +1065,15 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *arg, guint8* tr */ #ifndef DISABLE_REMOTING if (delegate->target && delegate->target->vtable->klass == mono_defaults.transparent_proxy_class) { + is_remote = TRUE; #ifndef DISABLE_COM if (((MonoTransparentProxy *)delegate->target)->remote_class->proxy_class != mono_class_get_com_object_class () && !mono_class_is_com_object (((MonoTransparentProxy *)delegate->target)->remote_class->proxy_class)) #endif method = mono_marshal_get_remoting_invoke (method); - } else + } #endif - { + if (!is_remote) { sig = tramp_info->sig; if (!(sig && method == tramp_info->method)) { mono_error_init (&err); -- 2.11.4.GIT