[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit b9b720edcd861a20ecd35990da4bfbd327663971
Author: Mirco Bauer <meebey at meebey.net>
Date:   Fri Aug 6 17:40:56 2010 +0200

    Fix mono/test test suite compilation.
    
    Taken from upstream's git repo:
    commit 818933a0e3e7f5869c983ca2209f6166ed4e5aa6
    Author: Rodrigo Kumpera <kumpera at gmail.com>
    Date:   Fri Jul 30 12:29:35 2010 -0300
    
        Fix mono/test test suite compilation.
    
        2010-07-30 Rodrigo Kumpera  <rkumpera at novell.com>
    
            * class.c (mono_class_layout_fields): Comment out an
            assert from a backport. It can't be done under 2.6
            due to weaker SRE implementation.

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 88dee28..16ecd1b 100644
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -1721,8 +1721,8 @@ mono_class_layout_fields (MonoClass *class)
 					field->offset += align - 1;
 					field->offset &= ~(align - 1);
 				}
-				/*TypeBuilders produce all sort of weird things*/
-				g_assert (class->image->dynamic || field->offset > 0);
+				/*can't have this assert on 2.6 since its SRE has much more trouble handling inflated types in SRE context.*/
+				/*g_assert (class->image->dynamic || field->offset > 0);*/
 				real_size = field->offset + size;
 			}
 

-- 
mono