Check type parameter substitutions for nested interfaces as well

diff --git a/mcs/errors/cs0695-6.cs b/mcs/errors/cs0695-6.cs
new file mode 100644 (file)
index 0000000..26721c1
--- /dev/null
+++ b/mcs/errors/cs0695-6.cs
@@ -0,0 +1,20 @@
+// CS0695: `Test<T>.TestN' cannot implement both `C<T>.I' and `C<string>.I' because they may unify for some type parameter substitutions
+// Line: 17
+
+class C<T>
+{
+       public interface I
+       {
+       }
+       
+       public class N : C<string>
+       {
+       }
+}
+
+class Test<T> : C<T>
+{
+       class TestN : I, N.I
+       {
+       }
+}

diff --git a/mcs/mcs/class.cs b/mcs/mcs/class.cs
index 92e8febbe0e77e487bc184585a387cc569d9db66..d06b8bde135fe8f67375bf04b88f164cd15c2674 100644 (file)
--- a/mcs/mcs/class.cs
+++ b/mcs/mcs/class.cs
@@ -1558,7 +1558,9 @@ namespace Mono.CSharp
                                                                GetSignatureForError (), iface_type.GetSignatureForError ());
                                                        return false;
                                                }
+                                       }
 
+                                       if (iface_type.IsGenericOrParentIsGeneric) {
                                                if (spec.Interfaces != null) {
                                                        foreach (var prev_iface in iface_exprs) {
                                                                if (prev_iface == iface_type)