fix

Author: hyp

lib/IRGen/GenClangDecl.cpp

@@ -287,7 +287,7 @@ void IRGenModule::emitClangDecl(const clang::Decl *decl) {
       if (auto *destructor = record->getDestructor()) {
         // Ensure virtual destructors have the body defined, even if they're
         // not used directly, as they might be referenced by the emitted vtable.
-        if (destructor->isVirtual())
+        if (destructor->isVirtual() && !destructor->isDeleted())
           ensureImplicitCXXDestructorBodyIsDefined(destructor);
       }
       for (auto *method : record->methods()) {
@@ -342,12 +342,12 @@ void IRGenModule::finalizeClangCodeGen() {
 
 void IRGenModule::ensureImplicitCXXDestructorBodyIsDefined(
     clang::CXXDestructorDecl *destructor) {
-  if (!destructor->isUserProvided() &&
-      !destructor->doesThisDeclarationHaveABody()) {
-    assert(!destructor->isDeleted() &&
-           "Swift cannot handle a type with no known destructor.");
-    // Make sure we define the destructor so we have something to call.
-    auto &sema = Context.getClangModuleLoader()->getClangSema();
-    sema.DefineImplicitDestructor(clang::SourceLocation(), destructor);
-  }
+  if (destructor->isUserProvided() ||
+      destructor->doesThisDeclarationHaveABody())
+    return;
+  assert(!destructor->isDeleted() &&
+         "Swift cannot handle a type with no known destructor.");
+  // Make sure we define the destructor so we have something to call.
+  auto &sema = Context.getClangModuleLoader()->getClangSema();
+  sema.DefineImplicitDestructor(clang::SourceLocation(), destructor);
 }

test/Interop/Cxx/class/virtual-destructor-vtable-ref-irgen.swift

@@ -1,6 +1,7 @@
 // RUN: rm -rf %t
 // RUN: split-file %s %t
 // RUN: %target-swiftxx-frontend -emit-ir -I %t/Inputs -validate-tbd-against-ir=none %t/test.swift | %FileCheck %s
+// RUN: %target-swiftxx-frontend -verify -emit-ir -I %t/Inputs -validate-tbd-against-ir=none %t/test.swift -Xcc -DDELETED -o /dev/null
 
 //--- Inputs/module.modulemap
 module VtableDestructorRef {
@@ -12,6 +13,27 @@ module VtableDestructorRef {
 
 namespace impl {
 
+#ifdef DELETED
+
+template<class T>
+class BaseClass
+{
+public:
+    ~BaseClass() = delete;
+};
+
+template<class Fp, class T>
+class Func: public BaseClass<T>
+{
+   Fp x;
+public:
+    inline explicit Func(Fp x);
+    Func(const Func &) = delete;
+    ~Func();
+};
+
+#else
+
 template<class T>
 class BaseClass
 {
@@ -28,6 +50,7 @@ public:
     inline explicit Func(Fp x) : x(x) {}
 };
 
+#endif
 
 template <class _Fp> class ValueFunc;
 
@@ -103,4 +126,4 @@ public func test() {
 }
 
 // Make sure we reach the virtual destructor of 'Func'.
-// CHECK: define linkonce_odr {{.*}} @{{_ZN4impl4FuncIZNK8MyFutureIiE12OnCompletionEPFvPvES3_EUlRK12MyFutureBaseE_FvS8_EED2Ev|\?\?1\?\$BaseClass@\$\$A6AXAEBVMyFutureBase@@@Z@impl@@UEAA@XZ}}
+// CHECK: define linkonce_odr {{.*}} @{{_ZN4impl4FuncIZNK8MyFutureIiE12OnCompletionEPFvPvES3_EUlRK12MyFutureBaseE_FvS8_EED2Ev|"\?\?1\?\$BaseClass@\$\$A6AXAEBVMyFutureBase@@@Z@impl@@UEAA@XZ"}}