Merge pull request #67873 from apple/egorzhdan/pthread_mutexattr_t

[cxx-interop] Make sure to create empty initializers for C++ structs

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -2381,8 +2381,12 @@ namespace {
         hasMemberwiseInitializer = false;
       }
 
-      if (hasZeroInitializableStorage &&
-          !(cxxRecordDecl && cxxRecordDecl->hasDefaultConstructor())) {
+      bool needsEmptyInitializer = true;
+      if (cxxRecordDecl) {
+        needsEmptyInitializer = !cxxRecordDecl->hasDefaultConstructor() ||
+                                cxxRecordDecl->ctors().empty();
+      }
+      if (hasZeroInitializableStorage && needsEmptyInitializer) {
         // Add default constructor for the struct if compiling in C mode.
         // If we're compiling for C++:
         // 1. If a default constructor is declared, don't synthesize one.

test/Interop/Cxx/objc-correctness/pthread_mutexattr_t.swift

@@ -0,0 +1,6 @@
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-objc-interop -enable-experimental-cxx-interop
+// REQUIRES: OS=macosx
+
+import Darwin
+
+_ = pthread_mutexattr_t() // expected-warning {{'init()' is deprecated: This zero-initializes the backing memory of the struct}}

test/Interop/Cxx/symbolic-imports/indexing-emit-symbolic-module-interface-used-decls.swift

@@ -35,6 +35,9 @@ public func useConcreteTemplate() {
 // CHECK-EMPTY:
 // CHECK-NEXT: public struct TemplateRecord {
 // CHECK-EMPTY:
+// CHECK-NEXT:    @available(*, deprecated, message:
+// CHECK-NEXT:    public init()
+// CHECK-EMPTY:
 // CHECK-NEXT:    public func methodFunc(_ x: Any)
 // CHECK-NEXT:}
 // CHECK-NEXT:}

test/Interop/Cxx/symbolic-imports/indexing-emit-symbolic-module-interface.swift

@@ -123,15 +123,24 @@ import CxxModule
 // CHECK-EMPTY:
 // CHECK-NEXT:  struct TemplateRecord {
 // CHECK-EMPTY:
+// CHECK-NEXT:    @available(*, deprecated, message:
+// CHECK-NEXT:    public init()
+// CHECK-EMPTY:
 // CHECK-NEXT:    mutating func methodFunc(_ x: Any)
 // CHECK-EMPTY:
 // CHECK-NEXT:    struct InnerRecord {
 // CHECK-EMPTY:
+// CHECK-NEXT:      @available(*, deprecated, message:
+// CHECK-NEXT:      public init()
+// CHECK-EMPTY:
 // CHECK-NEXT:      mutating func innerMethod(_ y: Any)
 // CHECK-NEXT:    }
 // CHECK-EMPTY:
 // CHECK-NEXT:    struct InnerTemplate {
 // CHECK-EMPTY:
+// CHECK-NEXT:    @available(*, deprecated, message:
+// CHECK-NEXT:    public init()
+// CHECK-EMPTY:
 // CHECK-NEXT:      mutating func innerTemplateMethod()
 // CHECK-NEXT:    }
 // CHECK-EMPTY:

test/Interop/Cxx/symbolic-imports/print-symbolic-module-interface.swift

@@ -66,11 +66,17 @@ public:
 // CHECK-NEXT:    var y: Int32
 // CHECK-NEXT:  }
 // CHECK-NEXT:  struct TemplateRecord {
+// CHECK-NEXT:    @available(*, deprecated, message:
+// CHECK-NEXT:    init()
 // CHECK-NEXT:    mutating func methodFunc(_ x: Any)
 // CHECK-NEXT:    struct InnerRecord {
+// CHECK-NEXT:      @available(*, deprecated, message:
+// CHECK-NEXT:      init()
 // CHECK-NEXT:      mutating func innerMethod(_ y: Any)
 // CHECK-NEXT:    }
 // CHECK-NEXT:    struct InnerTemplate {
+// CHECK-NEXT:      @available(*, deprecated, message:
+// CHECK-NEXT:      init()
 // CHECK-NEXT:      mutating func innerTemplateMethod()
 // CHECK-NEXT:    }
 // CHECK-NEXT:    mutating func returnsTemplateMethod()
@@ -79,7 +85,11 @@ public:
 // CHECK-NEXT: }
 // CHECK-NEXT: typealias MyType = ns.TemplateRecord
 // CHECK-NEXT: struct OuterTemp2 {
+// CHECK-NEXT:   @available(*, deprecated, message:
+// CHECK-NEXT:   init()
 // CHECK-NEXT:   struct InnerTemp2 {
+// CHECK-NEXT:     @available(*, deprecated, message:
+// CHECK-NEXT:     init()
 // CHECK-NEXT:     init(x2: Any)
 // CHECK-NEXT:     mutating func testMe(_ p: Any, _ x: Any)
 // CHECK-NEXT:     var x2: Any