[633277] Import type parameters used as type parameter constraints

diff --git a/mcs/mcs/import.cs b/mcs/mcs/import.cs
index 1706891958b60186251b68f4c4e8d86c235523c7..1c39f4245046edc7ccdb37ae6ee5ff77d49ab446 100644 (file)
--- a/mcs/mcs/import.cs
+++ b/mcs/mcs/import.cs
@@ -221,10 +221,6 @@ namespace Mono.CSharp
                public static MethodSpec CreateMethod (MethodBase mb, TypeSpec declaringType)
                {
                        Modifiers mod = ReadMethodModifiers (mb, declaringType);
-                       //if (declaringType.IsInterface) {
-                       //    mod = (mod & ~Modifiers.ABSTRACT) | Modifiers.VIRTUAL;
-                       //}
-
                        TypeParameterSpec[] tparams;
                        ImportedMethodDefinition definition;
 
@@ -605,9 +601,13 @@ namespace Mono.CSharp
                        import_cache.Add (type, spec);
 
                        var constraints = type.GetGenericParameterConstraints ();
+                       List<TypeSpec> tparams = null;
                        foreach (var ct in constraints) {
-                               // TODO MemberCache: What to do ??
                                if (ct.IsGenericParameter) {
+                                       if (tparams == null)
+                                               tparams = new List<TypeSpec> ();
+
+                                       tparams.Add (CreateType (ct));
                                        continue;
                                }
 
@@ -627,6 +627,9 @@ namespace Mono.CSharp
                        if (spec.BaseType == null)
                                spec.BaseType = TypeManager.object_type;
 
+                       if (tparams != null)
+                               spec.TypeArguments = tparams.ToArray ();
+
                        return spec;
                }
 

diff --git a/mcs/tests/gtest-532-lib.cs b/mcs/tests/gtest-532-lib.cs
new file mode 100644 (file)
index 0000000..2f3db35
--- /dev/null
+++ b/mcs/tests/gtest-532-lib.cs
@@ -0,0 +1,7 @@
+// Compiler options: -t:library
+
+public interface IServicesContainer
+{
+       void Register<I, T> () where T : I;
+       void Register<I> (object instance);
+}

diff --git a/mcs/tests/gtest-532.cs b/mcs/tests/gtest-532.cs
new file mode 100644 (file)
index 0000000..c42cc45
--- /dev/null
+++ b/mcs/tests/gtest-532.cs
@@ -0,0 +1,26 @@
+// Compiler options: -r:gtest-532-lib.dll
+
+using System;
+
+public class DictionaryServicesContainer : IServicesContainer
+{
+       public void Register<I, T> () where T : I
+       {
+               throw new NotImplementedException ();
+       }
+
+       public void Register<I> (object instance)
+       {
+               throw new NotImplementedException ();
+       }
+
+       public I Resolve<I> ()
+       {
+               throw new NotImplementedException ();
+       }
+
+       public static void Main ()
+       {
+               new DictionaryServicesContainer ();
+       }
+}