2009-08-07 Rodrigo Kumpera <rkumpera@novell.com>

* method-to-ir.c (mono_method_to_ir/CEE_CONSTRAINED_): Handle the case when the method is dynamic. Fixes #529238. svn path=/trunk/mono/; revision=139583
mono · Aug 7, 2009 · ec795e1 · ec795e1
1 parent 0cdd60e
commit ec795e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-07  Rodrigo Kumpera  <rkumpera@novell.com>
+
+	* method-to-ir.c (mono_method_to_ir/CEE_CONSTRAINED_): Handle the
+	case when the method is dynamic. Fixes #529238.
+
 2009-08-06  Zoltan Varga  <vargaz@gmail.com>
 
 	* mini.c (mono_jit_compile_method_inner): Throw an exception instead

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
@@ -9557,7 +9557,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 			case CEE_CONSTRAINED_:
 				CHECK_OPSIZE (6);
 				token = read32 (ip + 2);
-				constrained_call = mono_class_get_full (image, token, generic_context);
+				if (method->wrapper_type != MONO_WRAPPER_NONE)
+					constrained_call =  (MonoClass *)mono_method_get_wrapper_data (method, token);
+				else
+					constrained_call = mono_class_get_full (image, token, generic_context);
 				CHECK_TYPELOAD (constrained_call);
 				ip += 6;
 				break;