[662440] Don't expand nested type builders of non-generic types

diff --git a/mcs/mcs/decl.cs b/mcs/mcs/decl.cs
index f92b4579185fa09a7e73390333b98dc71d033e36..8411f2b52c09266e2a6a8cdb6157f6438238d9df 100644 (file)
--- a/mcs/mcs/decl.cs
+++ b/mcs/mcs/decl.cs
@@ -1075,7 +1075,8 @@ namespace Mono.CSharp {
                {
                        var inflated = (MemberSpec) MemberwiseClone ();
                        inflated.declaringType = inflator.TypeInstance;
-                       inflated.state |= StateFlags.PendingMetaInflate;
+                       if (DeclaringType.IsGenericOrParentIsGeneric)
+                               inflated.state |= StateFlags.PendingMetaInflate;
 #if DEBUG
                        inflated.ID += 1000000;
 #endif

diff --git a/mcs/mcs/method.cs b/mcs/mcs/method.cs
index 425e31fb41bdffed7b68b95bd87fecf9a62f7521..2af0b7850937880452cd5226450829814e2650a9 100644 (file)
--- a/mcs/mcs/method.cs
+++ b/mcs/mcs/method.cs
@@ -309,17 +309,19 @@ namespace Mono.CSharp {
                        //
                        if (inflatedMetaInfo == null) {
                                if ((state & StateFlags.PendingMetaInflate) != 0) {
+                                       var dt_meta = DeclaringType.GetMetaInfo ();
+
                                        if (DeclaringType.IsTypeBuilder) {
                                                if (IsConstructor)
-                                                       inflatedMetaInfo = TypeBuilder.GetConstructor (DeclaringType.GetMetaInfo (), (ConstructorInfo) metaInfo);
+                                                       inflatedMetaInfo = TypeBuilder.GetConstructor (dt_meta, (ConstructorInfo) metaInfo);
                                                else
-                                                       inflatedMetaInfo = TypeBuilder.GetMethod (DeclaringType.GetMetaInfo (), (MethodInfo) metaInfo);
+                                                       inflatedMetaInfo = TypeBuilder.GetMethod (dt_meta, (MethodInfo) metaInfo);
                                        } else {
 #if STATIC
                                                // it should not be reached
                                                throw new NotImplementedException ();
 #else
-                                               inflatedMetaInfo = MethodInfo.GetMethodFromHandle (metaInfo.MethodHandle, DeclaringType.GetMetaInfo ().TypeHandle);
+                                               inflatedMetaInfo = MethodInfo.GetMethodFromHandle (metaInfo.MethodHandle, dt_meta.TypeHandle);
 #endif
                                        }
 

diff --git a/mcs/tests/gtest-550.cs b/mcs/tests/gtest-550.cs
new file mode 100644 (file)
index 0000000..a845c12
--- /dev/null
+++ b/mcs/tests/gtest-550.cs
@@ -0,0 +1,61 @@
+using System;
+
+namespace Foo
+{
+       public static class Magic
+       {
+               public interface IUpDown
+               {
+                       int DestinationDimension { get; }
+               }
+
+               public static int Main ()
+               {
+                       Magic<decimal>.Upsample (new Instance ());
+                       return 0;
+               }
+       }
+
+       public static class Magic<T>
+       {
+               public interface IAccessible { T this[int index] { get; set; } }
+
+               public interface IUpDown : Magic.IUpDown, IAccessible { }
+
+               public static void Upsample (IUpDown o)
+               {
+                       var count = o.DestinationDimension;
+               }
+       }
+
+       class Instance : Magic<decimal>.IUpDown
+       {
+               #region IUpDown Members
+
+               public int DestinationDimension
+               {
+                       get
+                       {
+                               return 1;
+                       }
+               }
+
+               #endregion
+
+               #region IAccessible Members
+
+               public decimal this[int index]
+               {
+                       get
+                       {
+                               throw new NotImplementedException ();
+                       }
+                       set
+                       {
+                               throw new NotImplementedException ();
+                       }
+               }
+
+               #endregion
+       }
+}
\ No newline at end of file

diff --git a/mcs/tests/ver-il-dmcs.xml b/mcs/tests/ver-il-dmcs.xml
index 697171442bde24a56d6a2f1385c3d94c9c02170f..679ab27e60efe87a64f89cd55b6150cd811324ba 100644 (file)
--- a/mcs/tests/ver-il-dmcs.xml
+++ b/mcs/tests/ver-il-dmcs.xml
@@ -1498,11 +1498,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="Tester+&lt;GetIndexError_Null&gt;c__AnonStorey0">
       <method name="Void &lt;&gt;m__0()">
         <size>91</size>
@@ -4161,11 +4156,6 @@
         <size>86</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-046.cs">
     <type name="Foo`1[T]">
@@ -6311,11 +6301,6 @@
         <size>17</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-116.cs">
     <type name="Slow.Test">
@@ -9993,11 +9978,6 @@
         <size>1</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-252.cs">
     <type name="EqualityComparer`1[T]">
@@ -11990,8 +11970,8 @@
       <method name="Void .ctor()">
         <size>7</size>
       </method>
-      <method name="Void Main()">
-        <size>53</size>
+      <method name="Int32 Main()">
+        <size>91</size>
       </method>
     </type>
   </test>
@@ -13101,11 +13081,6 @@
         <size>86</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-372.cs">
     <type name="TestClass`1[T]">
@@ -13966,11 +13941,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="ConditionalParsing+Const">
       <method name="Void .ctor()">
         <size>7</size>
@@ -14138,6 +14108,29 @@
       </method>
     </type>
   </test>
+  <test name="gtest-417.cs">
+    <type name="Indirect">
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="Base">
+      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()">
+        <size>12</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="TestCase">
+      <method name="Int32 Main()">
+        <size>125</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="gtest-418.cs">
     <type name="N.Nested">
       <method name="Void .ctor()">
@@ -14207,11 +14200,6 @@
         <size>171</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-422.cs">
     <type name="A">
@@ -14240,6 +14228,37 @@
       </method>
     </type>
   </test>
+  <test name="gtest-423.cs">
+    <type name="MonoTest.A`1[TA]">
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="MonoTest.A`1+B`1[TA,TB]">
+      <method name="Void foo()">
+        <size>1</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="MonoTest.A`1+B`1+C[TA,TB]">
+      <method name="Void bar()">
+        <size>16</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="MonoTest.Program">
+      <method name="Void Main()">
+        <size>1</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="gtest-424.cs">
     <type name="A">
       <method name="Void .ctor()">
@@ -17683,11 +17702,6 @@
         <size>61</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="B">
       <method name="Void BaseM()">
         <size>1</size>
@@ -18456,11 +18470,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-anon-39.cs">
     <type name="Test">
@@ -18536,11 +18545,6 @@
         <size>16</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="Test+&lt;GetItems&gt;c__Iterator0">
       <method name="Void .ctor()">
         <size>7</size>
@@ -19435,11 +19439,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="TestCase+&lt;Test&gt;c__AnonStorey0`1[T]">
       <method name="Void &lt;&gt;m__0()">
         <size>46</size>
@@ -21651,13 +21650,6 @@
       <method name="Void NewArrayBoundsTest_4()">
         <size>82</size>
       </method>
-    </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester">
       <method name="Void LeftShiftTest_6()">
         <size>155</size>
       </method>
@@ -21715,6 +21707,9 @@
       <method name="Void RightShiftTest_6()">
         <size>145</size>
       </method>
+      <method name="Void TypeAsTest_4()">
+        <size>113</size>
+      </method>
     </type>
   </test>
   <test name="gtest-etree-02.cs">
@@ -21901,11 +21896,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-etree-10.cs">
     <type name="Foo`1[T]">
@@ -21932,11 +21922,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-etree-11.cs">
     <type name="C">
@@ -22263,6 +22248,37 @@
       </method>
     </type>
   </test>
+  <test name="gtest-etree-26.cs">
+    <type name="A`1[TA]">
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="A`1+B`1[TA,TB]">
+      <method name="Void foo()">
+        <size>39</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="A`1+B`1+C`1[TA,TB,TC]">
+      <method name="Void bar()">
+        <size>6</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="Program">
+      <method name="Int32 Main()">
+        <size>7</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="gtest-exmethod-01.cs">
     <type name="SimpleTest">
       <method name="System.String Prefix(System.String, System.String)">
@@ -23275,11 +23291,6 @@
         <size>296</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-implicitarray-02.cs">
     <type name="MyString">
@@ -23510,11 +23521,6 @@
         <size>53</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-initialize-10.cs">
     <type name="Foo">
@@ -24013,11 +24019,6 @@
         <size>40</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-iter-10.cs">
     <type name="Test">
@@ -25928,13 +25929,6 @@
       <method name="Int32 Main()">
         <size>559</size>
       </method>
-    </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="TestGroupBy">
       <method name="Int32 &lt;Main&gt;m__0(Int32)">
         <size>4</size>
       </method>
@@ -26798,11 +26792,6 @@
         <size>2</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-linq-18.cs">
     <type name="C">
@@ -26895,11 +26884,6 @@
         <size>142</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="C+&lt;Main&gt;c__AnonStorey0">
       <method name="Void .ctor()">
         <size>7</size>
@@ -27685,11 +27669,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="gtest-optional-13.cs">
     <type name="A">
@@ -27807,22 +27786,6 @@
       </method>
     </type>
   </test>
-  <test name="gtest-repl-01.cs">
-    <type name="MyTest">
-      <method name="Void Run(System.String, System.String)">
-        <size>23</size>
-      </method>
-      <method name="Void Evaluate(System.String, System.String, System.Object)">
-        <size>80</size>
-      </method>
-      <method name="Void Main()">
-        <size>561</size>
-      </method>
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
-  </test>
   <test name="gtest-var-04.cs">
     <type name="Test">
       <method name="Void .ctor()">
@@ -31838,11 +31801,6 @@
         <size>91</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-207.cs">
     <type name="X">
@@ -32624,11 +32582,6 @@
         <size>38</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-233.cs">
     <type name="Tests">
@@ -33337,11 +33290,6 @@
         <size>0</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-260.cs">
     <type name="x.Test">
@@ -35367,11 +35315,6 @@
         <size>269</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="FancyInt">
       <method name="Void .ctor(Int32)">
         <size>8</size>
@@ -35883,11 +35826,6 @@
         <size>35</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-360.cs">
     <type name="Application">
@@ -37514,11 +37452,6 @@
         <size>284</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-430.cs">
     <type name="A">
@@ -37854,11 +37787,6 @@
         <size>755</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-450.cs">
     <type name="A">
@@ -39571,11 +39499,6 @@
         <size>39</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-526.cs">
     <type name="Test">
@@ -39852,11 +39775,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-54.cs">
     <type name="X">
@@ -40195,11 +40113,6 @@
         <size>145</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-555.cs">
     <type name="Test">
@@ -43314,11 +43227,6 @@
         <size>53</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-696.cs">
     <type name="S">
@@ -44208,11 +44116,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-732.cs">
     <type name="C">
@@ -44793,11 +44696,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-758.cs">
     <type name="C">
@@ -45974,6 +45872,16 @@
       </method>
     </type>
   </test>
+  <test name="test-803.cs">
+    <type name="A">
+      <method name="Int32 Main()">
+        <size>26</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-81.cs">
     <type name="N1.A">
       <method name="Void .ctor()">
@@ -46160,11 +46068,6 @@
         <size>63</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-89.cs">
     <type name="X">
@@ -48567,11 +48470,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-anon-53.cs">
     <type name="Test">
@@ -49068,11 +48966,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-anon-64.cs">
     <type name="Source">
@@ -49388,11 +49281,6 @@
         <size>3</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-anon-71.cs">
     <type name="Program">
@@ -51482,11 +51370,6 @@
         <size>247</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
     <type name="X+&lt;GetIt&gt;c__Iterator0">
       <method name="Void .ctor()">
         <size>7</size>
@@ -52446,11 +52329,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-iter-22.cs">
     <type name="Test">
@@ -53408,11 +53286,6 @@
         <size>177</size>
       </method>
     </type>
-    <type name="&lt;PrivateImplementationDetails&gt;">
-      <method name="Void .ctor()">
-        <size>7</size>
-      </method>
-    </type>
   </test>
   <test name="test-var-05.cs">
     <type name="MyClass">
@@ -53470,6 +53343,16 @@
       </method>
     </type>
   </test>
+  <test name="test-var-09.cs">
+    <type name="A">
+      <method name="Int32 Main()">
+        <size>12</size>
+      </method>
+      <method name="Void .ctor()">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-xml-042.cs">
     <type name="TestNamespace.TestClass">
       <method name="Void .ctor()">