[cxx-interop] Fix a bug with explicit, nested, self-contained types (and add a test).

Author: zoecarver

lib/ClangImporter/ClangImporter.cpp

@@ -6793,14 +6793,14 @@ bool anySubobjectsSelfContained(const clang::CXXRecordDecl *decl) {
   if (!decl->getDefinition())
     return false;
 
-  if (hasCustomCopyOrMoveConstructor(decl))
+  if (hasCustomCopyOrMoveConstructor(decl) || hasOwnedValueAttr(decl))
     return true;
 
   auto checkType = [](clang::QualType t) {
     if (auto recordType = dyn_cast<clang::RecordType>(t.getCanonicalType())) {
       if (auto cxxRecord =
               dyn_cast<clang::CXXRecordDecl>(recordType->getDecl())) {
-        return hasCustomCopyOrMoveConstructor(cxxRecord);
+        return anySubobjectsSelfContained(cxxRecord);
       }
     }
 
@@ -6841,9 +6841,8 @@ bool IsSafeUseOfCxxDecl::evaluate(Evaluator &evaluator,
       ->getParent()->getTypeForDecl()->getCanonicalTypeUnqualified();
 
     bool parentIsSelfContained =
-      hasOwnedValueAttr(method->getParent()) ||
-      (!isForeignReferenceType(parentQualType) &&
-       anySubobjectsSelfContained(method->getParent()));
+      !isForeignReferenceType(parentQualType) &&
+      anySubobjectsSelfContained(method->getParent());
 
     // If it returns a pointer or reference from an owned parent, that's a
     // projection (unsafe).

test/Interop/Cxx/class/method/Inputs/unsafe-projections.h

@@ -6,6 +6,8 @@
 struct NestedSelfContained;
 struct Empty;
 struct SelfContained;
+struct ExplicitSelfContained;
+struct NestedExplicitSelfContained;
 
 struct View {
   void *ptr;
@@ -14,6 +16,8 @@ struct View {
   void *empty() const;
   std::string name() const;
   NestedSelfContained nested() const;
+  ExplicitSelfContained explicitSelfContained() const;
+  NestedExplicitSelfContained explicitNested() const;
 };
 
 struct SelfContained {
@@ -27,6 +31,8 @@ struct SelfContained {
   int value() const;
   View view() const;
   int *pointer() const;
+  ExplicitSelfContained explicitSelfContained() const;
+  NestedExplicitSelfContained explicitNested() const;
 };
 
 struct NestedSelfContained {
@@ -39,6 +45,8 @@ struct NestedSelfContained {
   int value() const;
   View view() const;
   int *pointer() const;
+  ExplicitSelfContained explicitSelfContained() const;
+  NestedExplicitSelfContained explicitNested() const;
 };
 
 struct InheritSelfContained: SelfContained {
@@ -56,6 +64,17 @@ struct __attribute__((swift_attr("import_owned"))) ExplicitSelfContained {
 
   void *pointer() const;
   View view() const;
+  NestedSelfContained nested() const;
+};
+
+struct NestedExplicitSelfContained {
+  ExplicitSelfContained m;
+
+  SelfContained selfContained() const;
+  NestedSelfContained nested() const;
+  int value() const;
+  View view() const;
+  int *pointer() const;
 };
 
 struct Empty {

test/Interop/Cxx/class/method/unsafe-projections.swift

@@ -5,6 +5,8 @@
 // CHECK:   func empty() -> UnsafeMutableRawPointer!
 // CHECK:   func name() -> std{{.*}}string
 // CHECK:   func nested() -> NestedSelfContained
+// CHECK:   func explicitSelfContained() -> ExplicitSelfContained
+// CHECK:   func explicitNested() -> NestedExplicitSelfContained
 // CHECK: }
 
 // CHECK: struct SelfContained {
@@ -15,6 +17,8 @@
 // CHECK:   func value() -> Int32
 // CHECK:   func __viewUnsafe() -> View
 // CHECK:   func __pointerUnsafe() -> UnsafeMutablePointer<Int32>!
+// CHECK:   func explicitSelfContained() -> ExplicitSelfContained
+// CHECK:   func explicitNested() -> NestedExplicitSelfContained
 // CHECK: }
 
 // CHECK: struct NestedSelfContained {
@@ -25,6 +29,8 @@
 // CHECK:   func value() -> Int32
 // CHECK:   func __viewUnsafe() -> View
 // CHECK:   func __pointerUnsafe() -> UnsafeMutablePointer<Int32>!
+// CHECK:   func explicitSelfContained() -> ExplicitSelfContained
+// CHECK:   func explicitNested() -> NestedExplicitSelfContained
 // CHECK: }
 
 // CHECK: struct InheritSelfContained {
@@ -35,11 +41,22 @@
 // CHECK:   func value() -> Int32
 // CHECK:   func __viewUnsafe() -> View
 // CHECK:   func __pointerUnsafe() -> UnsafeMutablePointer<Int32>!
+// CHECK:   func explicitSelfContained() -> ExplicitSelfContained
+// CHECK:   func explicitNested() -> NestedExplicitSelfContained
 // CHECK: }
 
 // CHECK: struct ExplicitSelfContained {
 // CHECK:   func __pointerUnsafe() -> UnsafeMutableRawPointer!
 // CHECK:   func __viewUnsafe() -> View
+// CHECK:   func nested() -> NestedSelfContained
+// CHECK: }
+
+// CHECK: struct NestedExplicitSelfContained {
+// CHECK:   func selfContained() -> SelfContained
+// CHECK:   func nested() -> NestedSelfContained
+// CHECK:   func value() -> Int32
+// CHECK:   func __viewUnsafe() -> View
+// CHECK:   func __pointerUnsafe() -> UnsafeMutablePointer<Int32>!
 // CHECK: }
 
 // CHECK: struct Empty {