[astgen] Correctly represent FuncDecl as a DeclContect.

Author: zoecarver

include/swift/AST/CASTBridging.h

@@ -154,14 +154,20 @@ void *ParamDecl_create(void *ctx, void *loc, void *_Nullable argLoc,
                        void *_Nullable argName, void *_Nullable paramLoc,
                        void *_Nullable paramName, void *_Nullable type,
                        void *declContext);
+struct FuncDeclBridged {
+  void *declContext;
+  void *funcDecl;
+  void *decl;
+};
 
-void *FuncDecl_create(void *ctx, void *staticLoc, _Bool isStatic, void *funcLoc,
+struct FuncDeclBridged FuncDecl_create(void *ctx, void *staticLoc, _Bool isStatic, void *funcLoc,
                       BridgedIdentifier name, void *nameLoc, _Bool isAsync,
                       void *_Nullable asyncLoc, _Bool throws,
                       void *_Nullable throwsLoc, void *paramLLoc,
                       BridgedArrayRef params, void *paramRLoc,
-                      void *_Nullable body, void *_Nullable returnType,
+                      void *_Nullable returnType,
                       void *declContext);
+void FuncDecl_setBody(void *fn, void *body);
 
 void *SimpleIdentTypeRepr_create(void *ctx, void *loc, BridgedIdentifier id);
 

lib/AST/CASTBridging.cpp

@@ -220,12 +220,12 @@ void *ParamDecl_create(void *ctx, void *loc, void *_Nullable argLoc,
   return paramDecl;
 }
 
-void *FuncDecl_create(void *ctx, void *staticLoc, bool isStatic, void *funcLoc,
+struct FuncDeclBridged FuncDecl_create(void *ctx, void *staticLoc, bool isStatic, void *funcLoc,
                       BridgedIdentifier name, void *nameLoc, bool isAsync,
                       void *_Nullable asyncLoc, bool throws,
                       void *_Nullable throwsLoc, void *paramLLoc,
                       BridgedArrayRef params, void *paramRLoc,
-                      void *_Nullable body, void *_Nullable returnType,
+                      void *_Nullable returnType,
                       void *declContext) {
   auto *paramList = ParameterList::create(
       *static_cast<ASTContext *>(ctx), getSourceLocFromPointer(paramLLoc),
@@ -240,9 +240,12 @@ void *FuncDecl_create(void *ctx, void *staticLoc, bool isStatic, void *funcLoc,
       getSourceLocFromPointer(asyncLoc), throws,
       getSourceLocFromPointer(throwsLoc), nullptr, paramList,
       (TypeRepr *)returnType, (DeclContext *)declContext);
-  out->setBody((BraceStmt *)body, FuncDecl::BodyKind::Parsed);
 
-  return static_cast<Decl *>(out);
+  return {static_cast<DeclContext *>(out), static_cast<FuncDecl *>(out), static_cast<Decl *>(out)};
+}
+
+void FuncDecl_setBody(void *fn, void *body) {
+  ((FuncDecl *)fn)->setBody((BraceStmt *)body, FuncDecl::BodyKind::Parsed);
 }
 
 void *SimpleIdentTypeRepr_create(void *ctx, void *loc, BridgedIdentifier id) {

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -125,19 +125,13 @@ extension ASTGenVisitor {
     let rParamLoc = self.base.advanced(by: node.signature.input.leftParen.position.utf8Offset).raw
     let lParamLoc = self.base.advanced(by: node.signature.input.rightParen.position.utf8Offset).raw
 
+    
 
     var nameText = node.identifier.text
     let name = nameText.withUTF8 { buf in
       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
     }
 
-    let body: ASTNode?
-    if let nodeBody = node.body {
-      body = visit(nodeBody)
-    } else {
-      body = nil
-    }
-
     let returnType: ASTNode?
     if let output = node.signature.output {
       returnType = visit(output.returnType)
@@ -146,11 +140,27 @@ extension ASTGenVisitor {
     }
 
     let params = node.signature.input.parameterList.map { visit($0).rawValue }
-    return .decl(
-      params.withBridgedArrayRef { ref in
-        FuncDecl_create(
-          ctx, staticLoc, false, funcLoc, name, nameLoc, false, nil, false, nil, rParamLoc, ref, lParamLoc, body?.rawValue,
-          returnType?.rawValue, declContext)
-      })
+    let out = params.withBridgedArrayRef { ref in
+      FuncDecl_create(
+        ctx, staticLoc, false, funcLoc, name, nameLoc, false, nil, false, nil, rParamLoc, ref, lParamLoc,
+        returnType?.rawValue, declContext)
+    }
+    
+    let oldDeclContext = declContext
+    declContext = out.declContext
+    defer { declContext = oldDeclContext }
+    
+    let body: ASTNode?
+    if let nodeBody = node.body {
+      body = visit(nodeBody)
+    } else {
+      body = nil
+    }
+    
+    if let body = body {
+      FuncDecl_setBody(out.funcDecl, body.rawValue)
+    }
+    
+    return .decl(out.decl)
   }
 }