Merge pull request swiftlang#34649 from zoecarver/cxx/no-import-no-destructor

[cxx-interop] Don't import C++ objects that we can't destroy.

Author: zoecarver

lib/ClangImporter/ImportDecl.cpp

@@ -3499,7 +3499,7 @@ namespace {
 
         if (auto dtor = cxxRecordDecl->getDestructor()) {
           if (dtor->isDeleted() || dtor->getAccess() != clang::AS_public) {
-            result->setIsCxxNonTrivial(true);
+            return nullptr;
           }
         }
       }

test/Interop/Cxx/class/Inputs/type-classification.h

@@ -112,6 +112,17 @@ struct StructWithSubobjectPrivateDefaultedDestructor {
   StructWithPrivateDefaultedDestructor subobject;
 };
 
+struct StructWithDeletedDestructor {
+  ~StructWithDeletedDestructor() = delete;
+};
+
+struct StructWithInheritedDeletedDestructor
+    : StructWithDeletedDestructor {};
+
+struct StructWithSubobjectDeletedDestructor {
+  StructWithDeletedDestructor subobject;
+};
+
 // Tests for common sets of special member functions.
 
 struct StructTriviallyCopyableMovable {

test/Interop/Cxx/class/type-classification-loadable-silgen.swift

@@ -142,21 +142,6 @@ func pass(s: StructWithSubobjectDefaultedDestructor) {
   // CHECK: bb0(%0 : $StructWithSubobjectDefaultedDestructor):
 }
 
-// CHECK-LABEL: sil hidden [ossa] @$s4main4pass{{.*[ (]}}StructWithPrivateDefaultedDestructor)
-func pass(s: StructWithPrivateDefaultedDestructor) {
-  // CHECK: bb0(%0 : $*StructWithPrivateDefaultedDestructor):
-}
-
-// CHECK-LABEL: sil hidden [ossa] @$s4main4pass{{.*[ (]}}StructWithInheritedPrivateDefaultedDestructor)
-func pass(s: StructWithInheritedPrivateDefaultedDestructor) {
-  // CHECK: bb0(%0 : $*StructWithInheritedPrivateDefaultedDestructor):
-}
-
-// CHECK-LABEL: sil hidden [ossa] @$s4main4pass{{.*[ (]}}StructWithSubobjectPrivateDefaultedDestructor)
-func pass(s: StructWithSubobjectPrivateDefaultedDestructor) {
-  // CHECK: bb0(%0 : $*StructWithSubobjectPrivateDefaultedDestructor):
-}
-
 // Tests for common sets of special member functions.
 
 // CHECK-LABEL: sil hidden [ossa] @$s4main4pass{{.*[ (]}}StructTriviallyCopyableMovable)
@@ -173,8 +158,3 @@ func pass(s: StructNonCopyableTriviallyMovable) {
 func pass(s: StructNonCopyableNonMovable) {
   // CHECK: bb0(%0 : $*StructNonCopyableNonMovable):
 }
-
-// CHECK-LABEL: sil hidden [ossa] @$s4main4pass{{.*[ (]}}StructDeletedDestructor)
-func pass(s: StructDeletedDestructor) {
-  // CHECK: bb0(%0 : $*StructDeletedDestructor):
-}

test/Interop/Cxx/class/type-classification-module-interface.swift

@@ -0,0 +1,9 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=TypeClassification -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// Make sure we don't import objects that we can't destroy.
+// CHECK-NOT: StructWithPrivateDefaultedDestructor
+// CHECK-NOT: StructWithInheritedPrivateDefaultedDestructor
+// CHECK-NOT: StructWithSubobjectPrivateDefaultedDestructor
+// CHECK-NOT: StructWithDeletedDestructor
+// CHECK-NOT: StructWithInheritedDeletedDestructor
+// CHECK-NOT: StructWithSubobjectDeletedDestructor