2010-01-16 Zoltan Varga <vargaz@gmail.com>

* generic-sharing.c (instantiate_other_info): Don't create ftnptr's from the result of mono_compile_method (), it already includes an ftnptr. svn path=/branches/mono-2-6/mono/; revision=151611
mono · Feb 12, 2010 · de5d66e · de5d66e
1 parent 4d3a299
commit de5d66e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-16  Zoltan Varga  <vargaz@gmail.com>
+
+        * generic-sharing.c (instantiate_other_info): Don't create ftnptr's from the
+        result of mono_compile_method (), it already includes an ftnptr.
+
 2010-02-10  Geoff Norton  <gnorton@novell.com>
 
 	* reflection.c: Support building with DISABLE_REFLECTION

diff --git a/mono/metadata/generic-sharing.c b/mono/metadata/generic-sharing.c
@@ -799,9 +799,9 @@ instantiate_other_info (MonoDomain *domain, MonoRuntimeGenericContextOtherInfoTe
 		/*
 		 * We can't create a jump trampoline here, as it cannot be patched.
 		 */
-		return mono_create_ftnptr (mono_domain_get (), mono_compile_method (data));
+		return mono_compile_method (data);
 	case MONO_RGCTX_INFO_REMOTING_INVOKE_WITH_CHECK:
-		return mono_create_ftnptr (mono_domain_get (), mono_compile_method (mono_marshal_get_remoting_invoke_with_check (data)));
+		return mono_compile_method (mono_marshal_get_remoting_invoke_with_check (data));
 	case MONO_RGCTX_INFO_CLASS_FIELD:
 		return data;
 	case MONO_RGCTX_INFO_METHOD_RGCTX: {