Merge pull request #12763 from graydon/rdar-35198678-add-implicit-dtor-outside-typecheck

Author: swift-ci

include/swift/AST/Decl.h

@@ -3380,6 +3380,10 @@ class ClassDecl final : public NominalTypeDecl {
   /// Retrieve the destructor for this class.
   DestructorDecl *getDestructor();
 
+  /// Synthesize implicit, trivial destructor, add it to this ClassDecl
+  /// and return it.
+  DestructorDecl *addImplicitDestructor();
+
   /// Determine whether this class inherits the convenience initializers
   /// from its superclass.
   ///

lib/AST/Decl.cpp

@@ -2680,6 +2680,25 @@ DestructorDecl *ClassDecl::getDestructor() {
   return cast<DestructorDecl>(results.front());
 }
 
+DestructorDecl *ClassDecl::addImplicitDestructor() {
+  if (hasDestructor() || isInvalid())
+    return nullptr;
+
+  auto *selfDecl = ParamDecl::createSelf(getLoc(), this);
+
+  auto &ctx = getASTContext();
+  auto *DD = new (ctx) DestructorDecl(getLoc(), selfDecl, this);
+
+  DD->setImplicit();
+
+  // Create an empty body for the destructor.
+  DD->setBody(BraceStmt::create(ctx, getLoc(), { }, getLoc(), true));
+  addMember(DD);
+  setHasDestructor();
+  return DD;
+}
+
+
 bool ClassDecl::hasMissingDesignatedInitializers() const {
   auto *mutableThis = const_cast<ClassDecl *>(this);
   (void)mutableThis->lookupDirect(getASTContext().Id_init,

lib/ClangImporter/ImportDecl.cpp

@@ -4274,6 +4274,7 @@ namespace {
         auto result = createRootClass(Impl.SwiftContext.Id_Protocol,
                                       nsObjectDecl->getDeclContext());
         result->setForeignClassKind(ClassDecl::ForeignKind::RuntimeOnly);
+        result->addImplicitDestructor();
         return result;
       }
 
@@ -4356,8 +4357,10 @@ namespace {
 
       if (declaredNative)
         markMissingSwiftDecl(result);
-      if (decl->getAttr<clang::ObjCRuntimeVisibleAttr>())
+      if (decl->getAttr<clang::ObjCRuntimeVisibleAttr>()) {
         result->setForeignClassKind(ClassDecl::ForeignKind::RuntimeOnly);
+        result->addImplicitDestructor();
+      }
 
       // If this Objective-C class has a supertype, import it.
       SmallVector<TypeLoc, 4> inheritedTypes;
@@ -4389,6 +4392,7 @@ namespace {
       if (decl->getName() == "OS_object" ||
           decl->getName() == "OS_os_log") {
         result->setForeignClassKind(ClassDecl::ForeignKind::RuntimeOnly);
+        result->addImplicitDestructor();
       }
 
       // If the superclass is runtime-only, our class is also. This only

lib/Sema/CodeSynthesis.cpp

@@ -2207,20 +2207,7 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
 }
 
 void TypeChecker::addImplicitDestructor(ClassDecl *CD) {
-  if (CD->hasDestructor() || CD->isInvalid())
-    return;
-
-  auto *selfDecl = ParamDecl::createSelf(CD->getLoc(), CD);
-
-  auto *DD = new (Context) DestructorDecl(CD->getLoc(), selfDecl, CD);
-
-  DD->setImplicit();
-
-  // Type-check the destructor declaration.
-  typeCheckDecl(DD, /*isFirstPass=*/true);
-
-  // Create an empty body for the destructor.
-  DD->setBody(BraceStmt::create(Context, CD->getLoc(), { }, CD->getLoc(), true));
-  CD->addMember(DD);
-  CD->setHasDestructor();
+  auto *DD = CD->addImplicitDestructor();
+  if (DD)
+    typeCheckDecl(DD, /*isFirstPass=*/true);
 }