Permalink
Browse files

Merge from HEAD.

svn path=/branches/mono-1-1-13/mono/; revision=60530
  • Loading branch information...
1 parent 81051c1 commit 20889ba677ba3617e0f1ecbe9f026ee0b0d3f599 @vargaz vargaz committed May 10, 2006
Showing with 9 additions and 0 deletions.
  1. +3 −0 mono/mini/ChangeLog
  2. +6 −0 mono/mini/mini-x86.c
View
3 mono/mini/ChangeLog
@@ -1,5 +1,8 @@
2006-05-10 Zoltan Varga <vargaz@gmail.com>
+ * mini-x86.c (mono_arch_instrument_epilog): Fix handling of
+ MONO_TYPE_GENERICINST.
+
* mini-ia64.c (get_call_info): Fix handling of MONO_TYPE_GENERICINST.
* mini-amd64.c (mono_arch_instrument_epilog): Ditto.
View
6 mono/mini/mini-x86.c
@@ -1079,6 +1079,12 @@ mono_arch_instrument_epilog (MonoCompile *cfg, void *func, void *p, gboolean ena
case MONO_TYPE_R8:
save_mode = SAVE_FP;
break;
+ case MONO_TYPE_GENERICINST:
+ if (!mono_type_generic_inst_is_valuetype (mono_method_signature (method)->ret)) {
+ save_mode = SAVE_EAX;
+ break;
+ }
+ /* Fall through */
case MONO_TYPE_VALUETYPE:
save_mode = SAVE_STRUCT;
break;

0 comments on commit 20889ba

Please sign in to comment.