2006-05-10 Zoltan Varga <vargaz@gmail.com>

* mini-ia64.c (get_call_info): Fix handling of MONO_TYPE_GENERICINST. * mini-amd64.c (mono_arch_instrument_epilog): Ditto. svn path=/branches/mono-1-1-13/mono/; revision=60477
mono · May 9, 2006 · 61c9ea6 · 61c9ea6
1 parent e12df73
commit 61c9ea6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-10  Zoltan Varga  <vargaz@gmail.com>
+
+	* mini-ia64.c (get_call_info): Fix handling of MONO_TYPE_GENERICINST.
+
+	* mini-amd64.c (mono_arch_instrument_epilog): Ditto.	
+
 2006-04-21  Dick Porter  <dick@ximian.com>
 
 	* mini.c (mini_thread_cleanup): Clear the JIT TLS data when

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
@@ -4653,7 +4653,7 @@ mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean ena
 		save_mode = SAVE_XMM;
 		break;
 	case MONO_TYPE_GENERICINST:
-		if (mono_type_generic_inst_is_valuetype (mono_method_signature (method)->ret)) {
+		if (!mono_type_generic_inst_is_valuetype (mono_method_signature (method)->ret)) {
 			save_mode = SAVE_EAX;
 			break;
 		}

diff --git a/mono/mini/mini-ia64.c b/mono/mini/mini-ia64.c
@@ -399,7 +399,7 @@ get_call_info (MonoMethodSignature *sig, gboolean is_pinvoke)
 			cinfo->ret.reg = 8;
 			break;
 		case MONO_TYPE_GENERICINST:
-			if (mono_type_generic_inst_is_valuetype (sig->ret)) {
+			if (!mono_type_generic_inst_is_valuetype (sig->ret)) {
 				cinfo->ret.storage = ArgInIReg;
 				cinfo->ret.reg = IA64_R8;
 				break;