Author: martin
Date: 2005-04-12 14:31:00 -0400 (Tue, 12 Apr 2005)
New Revision: 42860
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/attribute.cs
Log:
*** Merged r40977 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-12 18:27:01 UTC (rev 42859)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-12 18:31:00 UTC (rev 42860)
@@ -1,3 +1,9 @@
+2005-02-21 Raja R Harinath <[EMAIL PROTECTED]>
+
+ Fix #72732.
+ * attribute.cs (Attribute.ResolveType): If a 'resolve_error' had
+ occured previously, don't resolve again.
+
2005-02-21 Marek Safar <[EMAIL PROTECTED]>
Fix #69949
Modified: trunk/mcs/gmcs/attribute.cs
===================================================================
--- trunk/mcs/gmcs/attribute.cs 2005-04-12 18:27:01 UTC (rev 42859)
+++ trunk/mcs/gmcs/attribute.cs 2005-04-12 18:31:00 UTC (rev 42860)
@@ -234,7 +234,7 @@
public virtual Type ResolveType (EmitContext ec)
{
- if (Type == null)
+ if (Type == null && !resolve_error)
Type = CheckAttributeType (ec);
return Type;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
