Author: zoltan
Date: 2006-02-19 17:44:43 -0500 (Sun, 19 Feb 2006)
New Revision: 57059
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
Log:
Fix a merge problem
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2006-02-19
22:44:34 UTC (rev 57058)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.c 2006-02-19
22:44:43 UTC (rev 57059)
@@ -1193,6 +1193,12 @@
case MONO_TYPE_VALUETYPE:
case MONO_TYPE_TYPEDBYREF:
return CEE_LDOBJ;
+ case MONO_TYPE_GENERICINST:
+ if (mono_type_generic_inst_is_valuetype (type))
+ return CEE_LDOBJ;
+ else
+ return OP_LOAD_MEMBASE;
+ break;
default:
g_error ("unknown type 0x%02x in type_to_load_membase",
type->type);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches