We always need to do this check before calling reflection.

svn path=/trunk/mcs/; revision=28850

diff --git a/mcs/gmcs/attribute.cs b/mcs/gmcs/attribute.cs
index 11d22459aea274fe504c3e5d03f9edb4da1cbd97..c998dbe9bbe25d2c41f283d88c495ea6e8ac0d74 100644 (file)
--- a/mcs/gmcs/attribute.cs
+++ b/mcs/gmcs/attribute.cs
@@ -1412,10 +1412,6 @@ namespace Mono.CSharp {
                        if (mc != null) 
                                return mc.GetObsoleteAttribute ();
 
-                       // TODO: remove after Constructor will be ready for IMethodData
-                       if ((mb.DeclaringType is TypeBuilder) || mb.DeclaringType.IsGenericInstance)
-                               return null;
-
                        return GetMemberObsoleteAttribute (mb);
                }
 
@@ -1431,6 +1427,9 @@ namespace Mono.CSharp {
                        if (type_obsolete != null)
                                return (ObsoleteAttribute)type_obsolete;
 
+                       if ((mi.DeclaringType is TypeBuilder) || mi.DeclaringType.IsGenericInstance)
+                               return null;
+
                        ObsoleteAttribute oa = System.Attribute.GetCustomAttribute (mi, TypeManager.obsolete_attribute_type, false) as ObsoleteAttribute;
                        analyzed_member_obsolete.Add (mi, oa == null ? FALSE : oa);
                        return oa;