ASTGen: Translate deinitializer declarations

Author: AnthonyLatsis

include/swift/AST/CASTBridging.h

@@ -326,15 +326,21 @@ ParamDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
                  BridgedSourceLoc cSecondNameLoc, void *_Nullable opaqueType,
                  void *_Nullable opaqueDefaultValue);
 
-struct BridgedFuncDecl
+void AbstractFunctionDecl_setBody(void *opaqueBody, void *opaqueDecl);
+
+struct BridgedDeclContextAndDecl
 FuncDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
                 BridgedSourceLoc cStaticLoc, BridgedSourceLoc cFuncKeywordLoc,
                 BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
                 void *_Nullable opaqueGenericParamList,
                 void *opaqueParameterList, BridgedSourceLoc cAsyncLoc,
                 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

@@ -442,7 +442,14 @@ ParamDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
   return paramDecl;
 }
 
-BridgedFuncDecl
+void AbstractFunctionDecl_setBody(void *opaqueBody, void *opaqueDecl) {
+  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, BridgedSourceLoc cFuncKeywordLoc,
                 BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
@@ -457,22 +464,28 @@ FuncDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
   auto asyncLoc = convertSourceLoc(cAsyncLoc);
   auto throwsLoc = convertSourceLoc(cThrowsLoc);
 
-  auto *out = FuncDecl::create(
+  auto *decl = FuncDecl::create(
       context, convertSourceLoc(cStaticLoc), StaticSpellingKind::None,
       convertSourceLoc(cFuncKeywordLoc), declName, convertSourceLoc(cNameLoc),
       asyncLoc.isValid(), asyncLoc, throwsLoc.isValid(), throwsLoc,
       static_cast<GenericParamList *>(opaqueGenericParamList), 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

@@ -211,6 +211,8 @@ extension ASTGenVisitor {
   }
 }
 
+// MARK: - AbstractStorageDecl
+
 extension ASTGenVisitor {
   public func visit(_ node: VariableDeclSyntax) -> ASTNode {
     let pattern = visit(node.bindings.first!.pattern).rawValue
@@ -231,14 +233,18 @@ extension ASTGenVisitor {
       )
     )
   }
+}
 
+// MARK: - AbstractFunctionDecl
+
+extension ASTGenVisitor {
   public func visit(_ node: FunctionDeclSyntax) -> ASTNode {
     // FIXME: Compute this location
     let staticLoc: BridgedSourceLoc = nil
 
     let (name, nameLoc) = node.name.bridgedIdentifierAndSourceLoc(in: self)
 
-    let out = FuncDecl_create(
+    let decl = FuncDecl_create(
       self.ctx,
       self.declContext,
       staticLoc,
@@ -254,12 +260,28 @@ extension ASTGenVisitor {
     )
 
     if let body = node.body {
-      self.withDeclContext(out.declContext) {
-        FuncDecl_setBody(out.funcDecl, self.visit(body).rawValue)
+      self.withDeclContext(decl.asDeclContext) {
+        AbstractFunctionDecl_setBody(self.visit(body).rawValue, decl.asDecl)
+      }
+    }
+
+    return .decl(decl.asDecl)
+  }
+
+  func visit(_ node: DeinitializerDeclSyntax) -> ASTNode {
+    let decl = DestructorDecl_create(
+      self.ctx,
+      self.declContext,
+      self.bridgedSourceLoc(for: node.deinitKeyword)
+    )
+
+    if let body = node.body {
+      self.withDeclContext(decl.asDeclContext) {
+        AbstractFunctionDecl_setBody(self.visit(body).rawValue, decl.asDecl)
       }
     }
 
-    return .decl(out.decl)
+    return .decl(decl.asDecl)
   }
 }
 

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