* generic.cs (TypeParameter.UpdateConstraints): Update 'constraints' if null.

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

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index bfe23489d454bfa3718732d4d3b575c39fd16035..5292bd24bee68a91fa655db9daa90448b5059987 100644 (file)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-23  Raja R Harinath  <rharinath@novell.com>
+
+       * generic.cs (TypeParameter.UpdateConstraints): Update
+       'constraints' if null.
+
 2006-02-22  Marek Safar  <marek.safar@seznam.cz>
 
        A fix for #77615

diff --git a/mcs/gmcs/generic.cs b/mcs/gmcs/generic.cs
index 0e18f4b4b0867e0a1a608c03ee1cfae8caf4a138..2ce534aa021da00317a6ba3e8053b0aec56fa396 100644 (file)
--- a/mcs/gmcs/generic.cs
+++ b/mcs/gmcs/generic.cs
@@ -785,10 +785,7 @@ namespace Mono.CSharp {
                        if (type == null)
                                throw new InvalidOperationException ();
 
-                       if (constraints == null) {
-                               new_constraints = constraints;
-                               return true;
-                       } else if (new_constraints == null)
+                       if (new_constraints == null)
                                return true;
 
                        if (!new_constraints.Resolve (ec))
@@ -796,7 +793,11 @@ namespace Mono.CSharp {
                        if (!new_constraints.ResolveTypes (ec))
                                return false;
 
-                       return constraints.CheckInterfaceMethod (new_constraints);
+                       if (constraints != null) 
+                               return constraints.CheckInterfaceMethod (new_constraints);
+
+                       constraints = new_constraints;
+                       return true;
                }
 
                public void EmitAttributes ()