[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.10.8.1-2-7-g3c43b7d

[Iain Lane]

The following commit has been merged in the master branch:
commit 508c4f5cb8a9cfd35224689e4f6d9fd31c794f61
Author: Iain Lane <laney at debian.org>
Date:   Sun Apr 15 13:22:11 2012 +0100

    Revert "Merge branch 'master-patches/fix_crash_in_fixup_cattrs'"
    
    This reverts commit 86127dcf508213eac5b50a65c989cf5971b57378, reversing
    changes made to 55a1a20a4d858346ed8a8d840abc3f9230ea816e.
    
    This branch introduced regressions which caused both nant and mono-upnp
    (at least) to FTBFS.
    
    Closes: #666623

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 7c364b0..9f33df1 100644
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -4324,7 +4324,7 @@ fixup_cattrs (MonoDynamicImage *assembly)
 			ctor = mono_g_hash_table_lookup (assembly->tokens, GUINT_TO_POINTER (token));
 			g_assert (ctor);
 
-			if (!strcmp (ctor->vtable->klass->name, "MonoCMethod") || !strcmp (ctor->vtable->klass->name, "ConstructorBuilder")) {
+			if (!strcmp (ctor->vtable->klass->name, "MonoCMethod")) {
 				MonoMethod *m = ((MonoReflectionMethod*)ctor)->method;
 				idx = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->method_to_table_idx, m));
 				values [MONO_CUSTOM_ATTR_TYPE] = (idx << MONO_CUSTOM_ATTR_TYPE_BITS) | MONO_CUSTOM_ATTR_TYPE_METHODDEF;

-- 
mono