Author: raja
Date: 2006-03-20 05:04:34 -0500 (Mon, 20 Mar 2006)
New Revision: 58178

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/icall.c
Log:
* icall.c (ves_icall_Type_GetInterfaces): Avoid 'max_interface_id' field
of MonoClasses representing open generic types.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2006-03-20 10:01:09 UTC (rev 58177)
+++ trunk/mono/mono/metadata/ChangeLog  2006-03-20 10:04:34 UTC (rev 58178)
@@ -1,7 +1,8 @@
 2006-03-20  Raja R Harinath  <[EMAIL PROTECTED]>
 
        * icall.c (ves_icall_Type_GetInterfaces): Avoid using
-       'interface_id' field of open generic types.
+       'interface_id' and 'max_interface_id' fields of MonoClasses
+       representing open generic types.
 
 Fri Mar 17 18:06:06 CET 2006 Paolo Molaro <[EMAIL PROTECTED]>
 

Modified: trunk/mono/mono/metadata/icall.c
===================================================================
--- trunk/mono/mono/metadata/icall.c    2006-03-20 10:01:09 UTC (rev 58177)
+++ trunk/mono/mono/metadata/icall.c    2006-03-20 10:04:34 UTC (rev 58178)
@@ -1666,6 +1666,12 @@
 
        MONO_ARCH_SAVE_REGS;
 
+       /* open generic-instance classes can share their interface_id */
+       if (class->generic_class && class->generic_class->inst->is_open) {
+               context = class->generic_class->context;
+               class = class->generic_class->container_class;
+       }
+
        mono_class_setup_vtable (class);
 
        slots = mono_bitset_new (class->max_interface_id + 1, 0);
@@ -1676,12 +1682,6 @@
                return mono_array_new (domain, mono_defaults.monotype_class, 0);
        }
 
-       /* open generic-instance classes can share their interface_id */
-       if (class->generic_class && class->generic_class->inst->is_open) {
-               context = class->generic_class->context;
-               class = class->generic_class->container_class;
-       }
-
        for (parent = class; parent; parent = parent->parent) {
                GPtrArray *tmp_ifaces = mono_class_get_implemented_interfaces 
(parent);
                if (tmp_ifaces) {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to