Support functions with statements in their body.

Author: zoecarver

include/swift/AST/CASTBridging.h

@@ -101,13 +101,14 @@ void *SwiftIntegerLiteralExpr_create(void *ctx, const char *_Nullable string,
 
 void *SwiftBooleanLiteralExpr_create(void *ctx, _Bool value, void *TokenLoc);
 
-    void *SwiftVarDecl_create(void *ctx, const char *_Nullable name,
+void *SwiftVarDecl_create(void *ctx, const char *_Nullable name,
                           void *loc, _Bool isStatic, _Bool isLet, void *dc);
 
 void *IfStmt_create(void *ctx, void *ifLoc, void *cond, void *_Nullable then, void *_Nullable elseLoc,
                     void *_Nullable elseStmt);
 
-void *BraceStmt_create(void *ctx, void *lbloc, BridgedArrayRef elements, void *rbloc);
+void *BraceStmt_createExpr(void *ctx, void *lbloc, BridgedArrayRef elements, void *rbloc);
+void *BraceStmt_createStmt(void *ctx, void *lbloc, BridgedArrayRef elements, void *rbloc);
 
 void *BridgedSourceLoc_advanced(void *loc, long len);
 

lib/AST/CASTBridging.cpp

@@ -145,10 +145,23 @@ void *IfStmt_create(void *ctx, void *ifLoc, void *cond, void *_Nullable then, vo
                               (Stmt *)elseStmt, None, Context);
 }
 
-void *BraceStmt_create(void *ctx, void *lbloc, BridgedArrayRef elements, void *rbloc) {
-  return BraceStmt::create(*static_cast<ASTContext *>(ctx), *(SourceLoc *)&lbloc,
-                               getArrayRef<ASTNode>(elements),
-                              *(SourceLoc *)&rbloc);
+void *BraceStmt_createExpr(void *ctx, void *lbloc, BridgedArrayRef elements, void *rbloc) {
+  ASTContext &Context = *static_cast<ASTContext *>(ctx);
+  return BraceStmt::create(Context, *(SourceLoc *)&lbloc,
+                           getArrayRef<ASTNode>(elements),
+                           *(SourceLoc *)&rbloc);
+}
+
+void *BraceStmt_createStmt(void *ctx, void *lbloc, BridgedArrayRef elements, void *rbloc) {
+  llvm::SmallVector<ASTNode, 6> nodes;
+  for (auto stmt : getArrayRef<Stmt *>(elements)) {
+    nodes.push_back(stmt);
+  }
+
+  ASTContext &Context = *static_cast<ASTContext *>(ctx);
+  return BraceStmt::create(Context, *(SourceLoc *)&lbloc,
+                           Context.AllocateCopy(nodes),
+                           *(SourceLoc *)&rbloc);
 }
 
 void *ParamDecl_create(void *ctx, void *loc,

lib/ASTGen/.swiftpm/xcode/package.xcworkspace/xcuserdata/zoecarver.xcuserdatad/UserInterfaceState.xcuserstate

@@ -59,7 +59,7 @@ extension ASTGenVisitor {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
 
     return statements.withBridgedArrayRef { ref in
-      BraceStmt_create(ctx, loc, ref, loc)
+      BraceStmt_createStmt(ctx, loc, ref, loc)
     }
   }
 

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -9,7 +9,7 @@ extension ASTGenVisitor {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
 
     let body = statements.withBridgedArrayRef { ref in
-      BraceStmt_create(ctx, loc, ref, loc)
+        BraceStmt_createExpr(ctx, loc, ref, loc)
     }
 
     return ClosureExpr_create(ctx, body, declContext)