[astgen] Address comments post-commit.

include/swift/AST/CASTBridging.h

@@ -142,8 +142,6 @@ struct ASTNodeBridged {
   ASTNodeKind kind;
 };
 
-void *BraceStmt_create(void *ctx, void *lbloc, BridgedArrayRef elements,
-                       void *rbloc);
 void *BraceStmt_create(void *ctx, void *lbloc, BridgedArrayRef elements,
                        void *rbloc);
 

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -21,6 +21,7 @@ enum ASTNode {
   case stmt(UnsafeMutableRawPointer)
   case expr(UnsafeMutableRawPointer)
   case type(UnsafeMutableRawPointer)
+  case misc(UnsafeMutableRawPointer)
 
   var rawValue: UnsafeMutableRawPointer {
     switch self {
@@ -32,6 +33,8 @@ enum ASTNode {
       return ptr
     case .type(let ptr):
       return ptr
+    case .misc(let ptr):
+      return ptr
     }
   }
 
@@ -44,7 +47,7 @@ enum ASTNode {
     case .decl(let d):
       return ASTNodeBridged(ptr: d, kind: .decl)
     default:
-      fatalError("Must be expr or stmt.")
+      fatalError("Must be expr, stmt, or decl.")
     }
   }
 }
@@ -96,8 +99,8 @@ struct ASTGenVisitor: SyntaxTransformVisitor {
         out.append(SwiftTopLevelCodeDecl_createStmt(ctx, declContext, loc, s, loc))
       case .expr(let e):
         out.append(SwiftTopLevelCodeDecl_createExpr(ctx, declContext, loc, e, loc))
-      case .type(_):
-        fatalError("Type should not exist at top level.")
+      default:
+        fatalError("Top level nodes must be decls, stmts, or exprs.")
       }
     }
 

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -11,7 +11,7 @@ extension ASTGenVisitor {
       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
     }
     let nameLoc = self.base.advanced(by: node.identifier.position.utf8Offset).raw
-    let genericParams = node.genericParameterClause.map(self.visit).map { $0.rawValue }
+    let genericParams = node.genericParameterClause.map { self.visit($0).rawValue }
     let out = TypeAliasDecl_create(
       self.ctx, self.declContext, aliasLoc, equalLoc, name, nameLoc, genericParams)
 
@@ -33,16 +33,17 @@ extension ASTGenVisitor {
     }
 
     let genericParams = node.genericParameterClause
-      .map(self.visit)
-      .map { $0.rawValue }
+      .map { self.visit($0).rawValue }
     let out = StructDecl_create(ctx, loc, name, loc, genericParams, declContext)
     let oldDeclContext = declContext
     declContext = out.declContext
     defer { declContext = oldDeclContext }
 
-    node.members.members.map(self.visit).withBridgedArrayRef { ref in
-      NominalTypeDecl_setMembers(out.nominalDecl, ref)
-    }
+    node.members.members
+      .map { self.visit($0).rawValue }
+      .withBridgedArrayRef { ref in
+        NominalTypeDecl_setMembers(out.nominalDecl, ref)
+      }
 
     return .decl(out.decl)
   }
@@ -59,9 +60,11 @@ extension ASTGenVisitor {
     declContext = out.declContext
     defer { declContext = oldDeclContext }
 
-    node.members.members.map(self.visit).withBridgedArrayRef { ref in
-      NominalTypeDecl_setMembers(out.nominalDecl, ref)
-    }
+    node.members.members
+      .map { self.visit($0).rawValue }
+      .withBridgedArrayRef { ref in
+        NominalTypeDecl_setMembers(out.nominalDecl, ref)
+      }
 
     return .decl(out.decl)
   }

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -4,7 +4,7 @@ import SwiftSyntax
 
 extension ASTGenVisitor {
   public func visit(_ node: ClosureExprSyntax) -> ASTNode {
-    let statements = node.statements.map(self.visit).map { $0.bridged() }
+    let statements = node.statements.map { self.visit($0).bridged() }
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
 
     let body = statements.withBridgedArrayRef { ref in
@@ -64,7 +64,7 @@ extension ASTGenVisitor {
   }
 
   public func visit(_ node: TupleExprElementListSyntax) -> ASTNode {
-    let elements = node.map(self.visit).map { $0.rawValue }
+    let elements = node.map { self.visit($0).rawValue }
 
     // TODO: find correct paren locs.
     let lParenLoc = self.base.advanced(by: node.position.utf8Offset).raw

lib/ASTGen/Sources/ASTGen/Generics.swift

@@ -9,7 +9,7 @@ extension ASTGenVisitor {
       self.base.advanced(by: $0.whereKeyword.position.utf8Offset).raw
     }
     let rAngleLoc = self.base.advanced(by: node.rightAngleBracket.position.utf8Offset).raw
-    return .decl(
+    return .misc(
       self.withBridgedParametersAndRequirements(node) { params, reqs in
         return GenericParamList_create(self.ctx, lAngleLoc, params, whereLoc, reqs, rAngleLoc)
       })

lib/ASTGen/Sources/ASTGen/Stmts.swift

@@ -4,7 +4,7 @@ import SwiftSyntax
 
 extension ASTGenVisitor {
   public func visit(_ node: CodeBlockSyntax) -> ASTNode {
-    let statements = node.statements.map(self.visit).map { $0.bridged() }
+    let statements = node.statements.map { self.visit($0).bridged() }
     let startLoc = self.base.advanced(by: node.position.utf8Offset).raw
     let endLoc = self.base.advanced(by: node.endPosition.utf8Offset).raw
 
@@ -15,7 +15,7 @@ extension ASTGenVisitor {
   }
 
   public func visit(_ node: IfStmtSyntax) -> ASTNode {
-    let conditions = node.conditions.map(self.visit).map { $0.rawValue }
+    let conditions = node.conditions.map { self.visit($0).rawValue }
     assert(conditions.count == 1)  // TODO: handle multiple conditions.
 
     let body = visit(node.body).rawValue