Merge pull request #10989 from rjmccall/remote-ast-nested-generics

Author: swift-ci

lib/RemoteAST/RemoteAST.cpp

@@ -135,7 +135,7 @@ class RemoteASTTypeBuilder {
 
   Type createNominalType(NominalTypeDecl *decl, Type parent) {
     // If the declaration is generic, fail.
-    if (decl->getGenericSignature())
+    if (decl->getGenericParams())
       return Type();
 
     // Validate the parent type.
@@ -148,7 +148,7 @@ class RemoteASTTypeBuilder {
   Type createBoundGenericType(NominalTypeDecl *decl, ArrayRef<Type> args,
                               Type parent) {
     // If the declaration isn't generic, fail.
-    if (!decl->getGenericSignature())
+    if (!decl->getGenericParams())
       return Type();
 
     // Validate the parent type.
@@ -212,9 +212,11 @@ class RemoteASTTypeBuilder {
           auto nominal = p->castTo<NominalType>();
           simpleComponents.emplace_back(SourceLoc(),
                                         nominal->getDecl()->getName());
+          simpleComponents.back().setValue(nominal->getDecl());
           componentReprs.push_back(&simpleComponents.back());
         }
       }
+      componentReprs.push_back(&genericRepr);
 
       CompoundIdentTypeRepr compoundRepr(componentReprs);
       genericType = checkTypeRepr(&compoundRepr);

test/RemoteAST/nominal_types.swift

@@ -50,27 +50,32 @@ enum G {
   case Gwhatever
 
   struct Foo {}
+  struct Bar<T> {}
 }
 printType(G.self)
 // CHECK: G
 printType(G.Foo.self)
 // CHECK: G.Foo
+printType(G.Bar<A>.self)
+// CHECK: G.Bar<A>
 
-struct H<T, U> {}
+struct H<T, U> {
+  struct Foo {}
+  struct Bar<V, W> {}
+}
 printType(H<A,A>.self)
 // CHECK: H<A, A>
 printType(H<B.Foo, H<B, A>>.self)
 // CHECK: H<B.Foo, H<B, A>>
+printType(H<B, B>.Foo.self)
+// CHECK: H<B, B>.Foo
+printType(H<A, B>.Bar<B, A>.self)
+// CHECK: H<A, B>.Bar<B, A>
 
 class I<T> {}
 printType(I<Int>.self)
 // CHECK: I<Int>
 
-// None of these are currently permitted by Sema.
-// TODO: non-generic types nested in generic types
-// TODO: generic types nested in generic types
-// TODO: generic types nested in non-generic types
-
 protocol J {}
 
 printType(J.self)