RemoteAST: type-check TypeReprs within a TopLevelCodeDecl

instead of just a ModuleDecl.

Fixes simple generic types.

Author: rjmccall

lib/RemoteAST/RemoteAST.cpp

@@ -33,9 +33,9 @@ namespace {
 class RemoteASTTypeBuilder {
   ASTContext &Ctx;
 
-  /// The notional module in which we're writing and type-checking code.
+  /// The notional context in which we're writing and type-checking code.
   /// Created lazily.
-  ModuleDecl *NotionalModule = nullptr;
+  DeclContext *NotionalDC = nullptr;
 
 public:
   using BuiltType = swift::Type;
@@ -320,21 +320,22 @@ class RemoteASTTypeBuilder {
                                        Demangle::Node::Kind kind);
 
   Type checkTypeRepr(TypeRepr *repr) {
-    ModuleDecl *module = getNotionalModule();
+    DeclContext *dc = getNotionalDC();
 
     TypeLoc loc(repr);
-    if (performTypeLocChecking(Ctx, loc, /*SILType*/ false, module,
+    if (performTypeLocChecking(Ctx, loc, /*SILType*/ false, dc,
                                /*diagnose*/ false))
       return Type();
 
     return loc.getType();
   }
 
-  ModuleDecl *getNotionalModule() {
-    if (!NotionalModule) {
-      NotionalModule = ModuleDecl::create(Ctx.getIdentifier(".RemoteAST"), Ctx);
+  DeclContext *getNotionalDC() {
+    if (!NotionalDC) {
+      NotionalDC = ModuleDecl::create(Ctx.getIdentifier(".RemoteAST"), Ctx);
+      NotionalDC = new (Ctx) TopLevelCodeDecl(NotionalDC);
     }
-    return NotionalModule;
+    return NotionalDC;
   }
 
   class TypeReprList {

test/RemoteAST/nominal_types.swift

@@ -53,3 +53,9 @@ printType(G.self)
 // CHECK: G
 printType(G.Foo.self)
 // CHECK: G.Foo
+
+struct H<T, U> {}
+printType(H<A,A>.self)
+// CHECK: H<A, A>
+printType(H<B.Foo, H<B, A>>.self)
+// CHECK: H<B.Foo, H<B, A>>