2008-11-24 Mark Probst <mark.probst@gmail.com>

	* mini-trampolines.c (mono_delegate_trampoline): Don't return a
	ftnptr.

svn path=/trunk/mono/; revision=119878

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 1495710a8f77afa51ea7ea4e5449dee45725ddc4..0176361c1166d9d69d41a0209a54376f6a7f3244 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-24  Mark Probst  <mark.probst@gmail.com>
+
+       * mini-trampolines.c (mono_delegate_trampoline): Don't return a
+       ftnptr.
+
 2008-11-24  Mark Probst  <mark.probst@gmail.com>
 
        * marshal.c (mono_type_native_stack_size): MONO_TYPE_I and

diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c
index d23208ed9b932ac0e395d17317d514d38cc548f4..e3a2805784f378e9d183737a4e0cf6e70fd68ca8 100644 (file)
--- a/mono/mini/mini-trampolines.c
+++ b/mono/mini/mini-trampolines.c
@@ -634,7 +634,7 @@ mono_delegate_trampoline (gssize *regs, guint8 *code, gpointer *tramp_data, guin
        delegate->invoke_impl = mono_get_addr_from_ftnptr (code);
        mono_debugger_trampoline_compiled (m, delegate->invoke_impl);
 
-       return code;
+       return mono_get_addr_from_ftnptr (code);
 }
 
 #endif