Allow more constrained call cases when using gsharedvt. Allow usage o…

…f the ldvirtftn opcode.
mono · Feb 13, 2013 · adbc424 · adbc424
1 parent 19eac76
commit adbc424
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
@@ -7244,6 +7244,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 						args [2] = emit_get_rgctx_klass (cfg, mono_class_check_context_used (constrained_call), constrained_call, MONO_RGCTX_INFO_KLASS);
 						ins = mono_emit_jit_icall (cfg, mono_object_tostring_gsharedvt, args);
 						goto call_end;
+					} else if (constrained_call->valuetype && cmethod->klass->valuetype) {
+						/* The 'Own method' case below */
 					} else {
 						GSHAREDVT_FAILURE (*ip);
 					}
@@ -10917,8 +10919,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 			case CEE_LDVIRTFTN: {
 				MonoInst *args [2];
 
-				GSHAREDVT_FAILURE (*ip);
-
 				CHECK_STACK (1);
 				CHECK_OPSIZE (6);
 				n = read32 (ip + 2);