Author: kumpera
Date: 2007-07-19 16:16:44 -0400 (Thu, 19 Jul 2007)
New Revision: 82322

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/verify.c
Log:
2007-07-19  Rodrigo Kumpera  <[EMAIL PROTECTED]>

        * verify.c: changed MONO_TYPE_TYPEDBYREF stack type from 
        TYPE_COMPLEX to TYPE_PTR, it did not make any sense to be
        grouped with class and valuetype. This change will simply 
        the code as it should be handled just like unmanaged pointers.



Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2007-07-19 19:42:44 UTC (rev 82321)
+++ trunk/mono/mono/metadata/ChangeLog  2007-07-19 20:16:44 UTC (rev 82322)
@@ -1,3 +1,10 @@
+2007-07-19  Rodrigo Kumpera  <[EMAIL PROTECTED]>
+
+       * verify.c: changed MONO_TYPE_TYPEDBYREF stack type from 
+       TYPE_COMPLEX to TYPE_PTR, it did not make any sense to be
+       grouped with class and valuetype. This change will simply 
+       the code as it should be handled just like unmanaged pointers.
+
 2007-07-19  Mark Probst  <[EMAIL PROTECTED]>
 
        * class.c (concat_two_strings_with_zero): Fixed a silly bug.

Modified: trunk/mono/mono/metadata/verify.c
===================================================================
--- trunk/mono/mono/metadata/verify.c   2007-07-19 19:42:44 UTC (rev 82321)
+++ trunk/mono/mono/metadata/verify.c   2007-07-19 20:16:44 UTC (rev 82322)
@@ -1524,6 +1524,7 @@
        /* FIXME: the spec says that you cannot have a pointer to method 
pointer, do we need to check this here? */ 
        case MONO_TYPE_FNPTR:
        case MONO_TYPE_PTR:
+       case MONO_TYPE_TYPEDBYREF:
                return TYPE_PTR | mask;
 
        case MONO_TYPE_CLASS:
@@ -1531,7 +1532,6 @@
        case MONO_TYPE_OBJECT:
        case MONO_TYPE_SZARRAY:
        case MONO_TYPE_ARRAY:
-       case MONO_TYPE_TYPEDBYREF:
        case MONO_TYPE_GENERICINST:
                return TYPE_COMPLEX | mask;
 
@@ -1591,6 +1591,7 @@
        /*FIXME: Do we need to check if it's a pointer to the method pointer? 
The spec says it' illegal to have that.*/
        case MONO_TYPE_FNPTR:
        case MONO_TYPE_PTR:
+       case MONO_TYPE_TYPEDBYREF:
                stack->stype = TYPE_PTR | mask;
                return;
 
@@ -1599,7 +1600,6 @@
        case MONO_TYPE_OBJECT:
        case MONO_TYPE_SZARRAY:
        case MONO_TYPE_ARRAY:
-       case MONO_TYPE_TYPEDBYREF:
 
        case MONO_TYPE_GENERICINST:
                stack->stype = TYPE_COMPLEX | mask;
@@ -2036,7 +2036,7 @@
 
        /*TODO verify aditional checks that needs to be done */
        case MONO_TYPE_TYPEDBYREF:
-               if (stack_type != TYPE_COMPLEX)
+               if (stack_type != TYPE_PTR)
                        return FALSE;
                g_assert (stack->type);
                if (stack->type->type != MONO_TYPE_TYPEDBYREF)

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

Reply via email to