Added isolated deallocator to TBDGen

Author: nickolas-pohilets

include/swift/SIL/SILModule.h

@@ -1024,6 +1024,10 @@ 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/SILGen/SILGen.cpp

@@ -1095,7 +1095,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);
@@ -1554,8 +1554,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
@@ -1642,7 +1641,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

@@ -213,7 +213,7 @@ void SILGenFunction::emitDeallocatingDestructor(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

@@ -654,9 +654,6 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   /// and calls isolated deallocating destuctor on the right executor.
   void emitIsolatingDestructor(DestructorDecl *dd);
 
-  /// 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'.

lib/TBDGen/TBDGen.cpp

@@ -995,8 +995,8 @@ void TBDGenVisitor::visitConstructorDecl(ConstructorDecl *CD) {
 }
 
 void TBDGenVisitor::visitDestructorDecl(DestructorDecl *DD) {
-  // Class destructors come in two forms (deallocating and non-deallocating),
-  // like constructors above. This is the deallocating one:
+  // Class destructors come in three forms (non-deallocating, deallocating,
+  // isolated deallocating). This is the deallocating one:
   visitAbstractFunctionDecl(DD);
 
   auto parentClass = DD->getParent()->getSelfClassDecl();
@@ -1005,6 +1005,11 @@ void TBDGenVisitor::visitDestructorDecl(DestructorDecl *DD) {
   if (!Lowering::usesObjCAllocator(parentClass)) {
     addSymbol(SILDeclRef(DD, SILDeclRef::Kind::Destroyer));
   }
+
+  // And isolated also does not always exist
+  if (Lowering::needsIsolatingDestructor(DD)) {
+    addSymbol(SILDeclRef(DD, SILDeclRef::Kind::IsolatedDeallocator));
+  }
 }
 
 void TBDGenVisitor::visitExtensionDecl(ExtensionDecl *ED) {

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"