Fixed CLS compliance check for generic parameters of type dynamic

(Fixes Bug #645232)
e-tobi · Oct 10, 2010 · 8275316 · 8275316
1 parent 0440378
commit 8275316
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/mcs/mcs/generic.cs b/mcs/mcs/generic.cs
@@ -1351,6 +1351,8 @@ protected override bool IsNotCLSCompliant ()
 				return true;
 
 			foreach (var ta in TypeArguments) {
+				if (ta == InternalType.Dynamic)
+					return false;
 				if (ta.MemberDefinition.IsNotCLSCompliant ())
 					return true;
 			}

diff --git a/mcs/tests/dtest-037.cs b/mcs/tests/dtest-037.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+[assembly:CLSCompliant(true)]
+
+public class A
+{
+    public static void Main ()
+    {
+    }
+
+    public void CLSCompliantMethod (IEnumerable<dynamic> parameter)
+    {
+    }
+}
diff --git a/mcs/tests/ver-il-dmcs.xml b/mcs/tests/ver-il-dmcs.xml
@@ -2296,6 +2296,19 @@
       </method>
     </type>
   </test>
+  <test name="dtest-037.cs">
+    <type name="A">
+      <method name="Void Main()">
+        <size>1</size>
+      </method>
+      <method name="Void CLSCompliantMethod(IEnumerable`1)">
+        <size>1</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="dtest-collectioninit-01.cs">
     <type name="Test">
       <method name="Int32 Main()">