Author: lupus
Date: 2007-01-19 11:00:17 -0500 (Fri, 19 Jan 2007)
New Revision: 71339
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini.c
Log:
Thu Jan 18 17:55:22 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* mini.c: deal with enums that become genericinsts by
being nested in a generic class (bug #79956).
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-01-19 15:52:02 UTC (rev 71338)
+++ trunk/mono/mono/mini/ChangeLog 2007-01-19 16:00:17 UTC (rev 71339)
@@ -8,6 +8,11 @@
* mini.c (mono_method_to_ir): Call mono_get_got_var () in a place where
it is
needed by the code generated by inssel.brg. Also fix a warning.
+Thu Jan 18 17:55:22 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+ * mini.c: deal with enums that become genericinsts by
+ being nested in a generic class (bug #79956).
+
Thu Jan 18 16:52:56 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* mini.c: match the generic definition to check for
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2007-01-19 15:52:02 UTC (rev 71338)
+++ trunk/mono/mono/mini/mini.c 2007-01-19 16:00:17 UTC (rev 71339)
@@ -2253,9 +2253,11 @@
return 0;
case MONO_TYPE_GENERICINST:
if (mono_type_generic_inst_is_valuetype (simple_type)) {
+ klass = mono_class_from_mono_type (simple_type);
+ if (klass->enumtype)
+ return target_type_is_incompatible (cfg,
klass->enum_basetype, arg);
if (arg->type != STACK_VTYPE)
return 1;
- klass = mono_class_from_mono_type (simple_type);
if (klass != arg->klass)
return 1;
return 0;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
