Use faster MemberKind when checking for a nested type

diff --git a/mcs/mcs/import.cs b/mcs/mcs/import.cs
index 972243faf8f01d7dedf9197f82a261ed2c479d83..4ad1164464672b2028caa2aecaa4c59f9ad0bfb7 100644 (file)
--- a/mcs/mcs/import.cs
+++ b/mcs/mcs/import.cs
@@ -840,7 +840,11 @@ namespace Mono.CSharp
                        Namespace ns = targetNamespace;
                        string prev_namespace = null;
                        foreach (var t in types) {
-                               if (t == null || t.IsNested)
+                               if (t == null)
+                                       continue;
+
+                               // Be careful not to trigger full parent type loading
+                               if (t.MemberType == MemberTypes.NestedType)
                                        continue;
 
                                if (t.Name[0] == '<')

diff --git a/mcs/tests/test-792-lib.il b/mcs/tests/test-792-lib.il
index e7d4b8bf4e25fc349c21749e9d6df40150c31cf9..620f5c1ebcb21fdbf6a61cf43f71c64b3e9aaca3 100644 (file)
--- a/mcs/tests/test-792-lib.il
+++ b/mcs/tests/test-792-lib.il
@@ -53,9 +53,29 @@
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
   {
-    .maxstack  8
     IL_0000:  ldarg.0
     IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
     IL_0006:  ret
   }  
-}
\ No newline at end of file
+}
+
+.class public auto ansi beforefieldinit Another extends ['missing-lib']XXBase
+{
+  .class auto ansi nested public beforefieldinit Nested extends [mscorlib]System.Object
+  {
+    .method public hidebysig specialname rtspecialname instance void  .ctor() cil managed
+    {
+      IL_0000:  ldarg.0
+      IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
+      IL_0006:  ret
+    }
+  }
+
+  .method public hidebysig specialname rtspecialname instance void  .ctor() cil managed
+  {
+    IL_0000:  ldarg.0
+    IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
+    IL_0006:  ret
+  }
+}
+