Merge pull request #64460 from zoecarver/factor-owned-attr-into-is-safe-req

[cxx-interop] Object model: fix crash when importing explicitly owned…

Author: zoecarver

lib/ClangImporter/ClangImporter.cpp

@@ -6589,6 +6589,7 @@ bool IsSafeUseOfCxxDecl::evaluate(Evaluator &evaluator,
 
         if (!cxxRecordReturnType->hasUserDeclaredCopyConstructor() &&
             !cxxRecordReturnType->hasUserDeclaredMoveConstructor() &&
+            !hasOwnedValueAttr(cxxRecordReturnType) &&
             hasPointerInSubobjects(cxxRecordReturnType)) {
           return false;
         }

test/Interop/Cxx/class/invalid-unsafe-projection-errors.swift

@@ -10,13 +10,16 @@ module Test {
 
 //--- Inputs/test.h
 struct Ptr { int *p; };
+struct __attribute__((swift_attr("import_owned"))) StirngLiteral { const char *name; };
 
 struct M {
         int *_Nonnull test1() const;
         int &test2() const;
         Ptr test3() const;
 
         int *begin() const;
+
+        StirngLiteral stringLiteral() const { return StirngLiteral{"M"}; }
 };
 
 //--- test.swift
@@ -40,4 +43,7 @@ public func test(x: M) {
   // CHECK: note: C++ method 'begin' that returns an iterator is unavailable
   // CHECK: note: C++ methods that return iterators are potentially unsafe. Try re-writing to use Swift iterator APIs.
   x.begin()
+
+  // CHECK-NOT: error: value of type 'M' has no member 'stringLiteral'
+  x.stringLiteral()
 }