Added isolated deallocator to TBDGen

Author: nickolas-pohilets

include/swift/SIL/SILModule.h

@@ -1087,6 +1087,9 @@ namespace Lowering {
 /// Determine whether the given class will be allocated/deallocated using the
 /// Objective-C runtime, i.e., +alloc and -dealloc.
 LLVM_LIBRARY_VISIBILITY bool usesObjCAllocator(ClassDecl *theClass);
+/// Determine if isolating destructor is needed.
+LLVM_LIBRARY_VISIBILITY bool needsIsolatingDestructor(DestructorDecl *dd);
+
 } // namespace Lowering
 } // namespace swift
 

lib/SIL/IR/SILSymbolVisitor.cpp

@@ -714,9 +714,9 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
   }
 
   void visitDestructorDecl(DestructorDecl *DD) {
-    // Destructors come in two forms (deallocating and non-deallocating), like
-    // constructors above. Classes use both but move only non-class nominal
-    // types only use the deallocating one. This is the deallocating one:
+    // Destructors come in three forms (non-deallocating, deallocating, isolated
+    // deallocating) Classes use all three but move only non-class nominal types
+    // only use the deallocating one. This is the deallocating one:
     visitAbstractFunctionDecl(DD);
 
     if (auto parentClass = DD->getParent()->getSelfClassDecl()) {
@@ -725,6 +725,11 @@ class SILSymbolVisitorImpl : public ASTVisitor<SILSymbolVisitorImpl> {
         addFunction(SILDeclRef(DD, SILDeclRef::Kind::Destroyer));
       }
     }
+
+    // And isolated also does not always exist
+    if (Lowering::needsIsolatingDestructor(DD)) {
+      addFunction(SILDeclRef(DD, SILDeclRef::Kind::IsolatedDeallocator));
+    }
   }
 
   void visitExtensionDecl(ExtensionDecl *ED) {

lib/SILGen/SILGen.cpp

@@ -1114,7 +1114,7 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
   }
   case SILDeclRef::Kind::Deallocator: {
     auto *dd = cast<DestructorDecl>(constant.getDecl());
-    if (SILGenFunction::shouldEmitIsolatingDestructor(dd)) {
+    if (needsIsolatingDestructor(dd)) {
       auto loc = RegularLocation::getAutoGeneratedLocation(dd);
       preEmitFunction(constant, f, loc);
       PrettyStackTraceSILFunction X("silgen emitIsolatingDestructor", f);
@@ -1573,8 +1573,7 @@ bool SILGenModule::requiresIVarDestroyer(ClassDecl *cd) {
 void SILGenModule::emitObjCAllocatorDestructor(ClassDecl *cd,
                                                DestructorDecl *dd) {
 
-  const bool isActorIsolated =
-      SILGenFunction::shouldEmitIsolatingDestructor(dd);
+  const bool isActorIsolated = needsIsolatingDestructor(dd);
 
   // Emit the isolated deallocating destructor.
   // If emitted, it implements actual deallocating and deallocating destructor
@@ -1663,7 +1662,7 @@ void SILGenModule::emitDestructor(ClassDecl *cd, DestructorDecl *dd) {
   // Emit the isolated deallocating destructor.
   // If emitted, it implements actual deallocating and deallocating destructor
   // only switches executor
-  if (SILGenFunction::shouldEmitIsolatingDestructor(dd)) {
+  if (needsIsolatingDestructor(dd)) {
     SILDeclRef deallocator(dd, SILDeclRef::Kind::IsolatedDeallocator);
     emitFunctionDefinition(deallocator,
                            getFunction(deallocator, ForDefinition));

lib/SILGen/SILGenDestructor.cpp

@@ -283,7 +283,7 @@ void SILGenFunction::emitDeallocatingMoveOnlyDestructor(DestructorDecl *dd) {
   B.createReturn(loc, emitEmptyTuple(loc));
 }
 
-bool SILGenFunction::shouldEmitIsolatingDestructor(DestructorDecl *dd) {
+bool Lowering::needsIsolatingDestructor(DestructorDecl *dd) {
   auto ai = swift::getActorIsolation(dd);
   if (!ai.isActorIsolated()) {
     return false;

lib/SILGen/SILGenFunction.h

@@ -828,9 +828,6 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   /// definite initialization.
   bool isCtorWithHopsInjectedByDefiniteInit();
 
-  /// Checks if isolating destructor is needed.
-  static bool shouldEmitIsolatingDestructor(DestructorDecl *dd);
-
   /// Generates code for a struct constructor.
   /// This allocates the new 'self' value, emits the
   /// body code, then returns the final initialized 'self'.

test/Concurrency/deinit_isolation_tbd.swift

@@ -0,0 +1,11 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | %FileCheck %s
+
+import Foundation
+
+public class Foo {
+  @MainActor
+  deinit {}
+}
+
+// CHECK: @"$s20deinit_isolation_tbd3FooCfZ"
+// CHECK: @"$s20deinit_isolation_tbd3FooCfD"