ASTGen: Translate deinitializer declarations

Author: AnthonyLatsis

include/swift/AST/CASTBridging.h

@@ -343,7 +343,9 @@ void *ParamDecl_create(
     void *_Nullable opaqueType,
     void *_Nullable opaqueDefaultArgumentExpr);
 
-struct BridgedFuncDecl FuncDecl_create(
+void AbstractFunctionDecl_setBody(void *opaqueDecl, void *opaqueBody);
+
+BridgedDeclContextAndDecl FuncDecl_create(
     BridgedASTContext cContext,
     BridgedDeclContext cDeclContext,
     BridgedSourceLoc cStaticLoc,
@@ -356,7 +358,11 @@ struct BridgedFuncDecl FuncDecl_create(
     BridgedSourceLoc cThrowsLoc,
     void *_Nullable opaqueReturnType,
     void *_Nullable opaqueGenericWhereClause);
-void FuncDecl_setBody(void *fn, void *body);
+
+BridgedDeclContextAndDecl DestructorDecl_create(
+    BridgedASTContext cContext,
+    BridgedDeclContext cDeclContext,
+    BridgedSourceLoc cDeinitKeywordLoc);
 
 void *SimpleIdentTypeRepr_create(BridgedASTContext cContext,
                                  BridgedSourceLoc cLoc, BridgedIdentifier id);

lib/AST/CASTBridging.cpp

@@ -433,7 +433,14 @@ void *ParamDecl_create(
   return paramDecl;
 }
 
-BridgedFuncDecl FuncDecl_create(
+void AbstractFunctionDecl_setBody(void *opaqueDecl, void *opaqueBody) {
+  auto *decl = static_cast<Decl *>(opaqueDecl);
+
+  cast<AbstractFunctionDecl>(decl)->setBody(
+      static_cast<BraceStmt *>(opaqueBody), FuncDecl::BodyKind::Parsed);
+}
+
+BridgedDeclContextAndDecl FuncDecl_create(
     BridgedASTContext cContext,
     BridgedDeclContext cDeclContext,
     BridgedSourceLoc cStaticLoc,
@@ -453,7 +460,7 @@ BridgedFuncDecl FuncDecl_create(
   auto asyncLoc = convertSourceLoc(cAsyncLoc);
   auto throwsLoc = convertSourceLoc(cThrowsLoc);
 
-  auto *out = FuncDecl::create(
+  auto *decl = FuncDecl::create(
       context,
       convertSourceLoc(cStaticLoc),
       StaticSpellingKind::None,
@@ -468,17 +475,21 @@ BridgedFuncDecl FuncDecl_create(
       paramList,
       static_cast<TypeRepr *>(opaqueReturnType),
       convertDeclContext(cDeclContext));
-  out->setTrailingWhereClause(
+  decl->setTrailingWhereClause(
       static_cast<TrailingWhereClause *>(opaqueGenericWhereClause));
 
-  return {
-      bridgeDeclContext(out),
-      static_cast<FuncDecl *>(out),
-      static_cast<Decl *>(out)};
+  return {bridgeDeclContext(decl), static_cast<Decl *>(decl)};
 }
 
-void FuncDecl_setBody(void *fn, void *body) {
-  ((FuncDecl *)fn)->setBody((BraceStmt *)body, FuncDecl::BodyKind::Parsed);
+BridgedDeclContextAndDecl DestructorDecl_create(
+    BridgedASTContext cContext,
+    BridgedDeclContext cDeclContext,
+    BridgedSourceLoc cDeinitKeywordLoc) {
+  ASTContext &context = convertASTContext(cContext);
+  auto *decl = new (context) DestructorDecl(
+      convertSourceLoc(cDeinitKeywordLoc), convertDeclContext(cDeclContext));
+
+  return {bridgeDeclContext(decl), static_cast<Decl *>(decl)};
 }
 
 void *SimpleIdentTypeRepr_create(BridgedASTContext cContext,

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -240,6 +240,8 @@ extension ASTGenVisitor {
   }
 }
 
+// MARK: - AbstractStorageDecl
+
 extension ASTGenVisitor {
   public func visit(_ node: VariableDeclSyntax) -> ASTNode {
     let pattern = visit(node.bindings.first!.pattern).rawValue
@@ -261,14 +263,18 @@ extension ASTGenVisitor {
       )
     )
   }
+}
+
+// MARK: - AbstractFunctionDecl
 
+extension ASTGenVisitor {
   public func visit(_ node: FunctionDeclSyntax) -> ASTNode {
     // FIXME: Compute this location
     let staticLoc: BridgedSourceLoc = nil
 
     let (name, nameLoc) = self.bridgedIdentifierAndSourceLoc(for: node.identifier)
 
-    let out = FuncDecl_create(
+    let declAndDeclContext = FuncDecl_create(
       self.ctx,
       self.declContext,
       staticLoc,
@@ -283,22 +289,33 @@ extension ASTGenVisitor {
       node.genericWhereClause.map(self.visit)?.rawValue
     )
 
-    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 = node.body {
+      self.visitFunctionCodeBlock(body, declContextAndDecl: declAndDeclContext)
     }
 
-    if let body = body {
-      FuncDecl_setBody(out.funcDecl, body.rawValue)
+    return .decl(declAndDeclContext.decl)
+  }
+
+  func visit(_ node: DeinitializerDeclSyntax) -> ASTNode {
+    let declAndDeclContext = DestructorDecl_create(
+      self.ctx,
+      self.declContext,
+      self.bridgedSourceLoc(for: node.deinitKeyword)
+    )
+
+    if let body = node.body {
+      self.visitFunctionCodeBlock(body, declContextAndDecl: declAndDeclContext)
     }
 
-    return .decl(out.decl)
+    return .decl(declAndDeclContext.decl)
+  }
+
+  private func visitFunctionCodeBlock(_ block: CodeBlockSyntax, declContextAndDecl: BridgedDeclContextAndDecl) {
+    let oldDeclContext = declContext
+    declContext = declContextAndDecl.declContext
+    defer { declContext = oldDeclContext }
+
+    AbstractFunctionDecl_setBody(declContextAndDecl.decl, self.visit(block).rawValue)
   }
 }
 

test/ASTGen/verify-parse.swift

@@ -148,6 +148,10 @@ where
 class
 Class<T>: Proto1 where T: Proto3 {
   func method(_ b: Bool) {}
+
+  deinit {
+    if true {}
+  }
 }
 
 actor