Merge pull request #66220 from apple/egorzhdan/c-default-init

[cxx-interop] Synthesize a deprecated zero initializer for C++ structs

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -2379,11 +2379,30 @@ namespace {
         hasMemberwiseInitializer = false;
       }
 
-      if (hasZeroInitializableStorage && !cxxRecordDecl) {
+      if (hasZeroInitializableStorage &&
+          !(cxxRecordDecl && cxxRecordDecl->hasDefaultConstructor())) {
         // Add default constructor for the struct if compiling in C mode.
-        // If we're compiling for C++, we'll import the C++ default constructor
-        // (if there is one), so we don't need to synthesize one here.
-        ctors.push_back(synthesizer.createDefaultConstructor(result));
+        // If we're compiling for C++:
+        // 1. If a default constructor is declared, don't synthesize one.
+        // 2. If a default constructor is deleted, don't try to synthesize one.
+        // 3. If there is no default constructor, synthesize a C-like default
+        //    constructor that zero-initializes the backing memory of the
+        //    struct. This is important to maintain source compatibility when a
+        //    client enables C++ interop in an existing project that uses C
+        //    interop and might rely on the fact that C structs have a default
+        //    constructor available in Swift.
+        ConstructorDecl *defaultCtor =
+            synthesizer.createDefaultConstructor(result);
+        ctors.push_back(defaultCtor);
+        if (cxxRecordDecl) {
+          auto attr = AvailableAttr::createPlatformAgnostic(
+              defaultCtor->getASTContext(),
+              "This zero-initializes the backing memory of the struct, which "
+              "is unsafe for some C++ structs. Consider adding an explicit "
+              "default initializer for this C++ struct.",
+              "", PlatformAgnosticAvailabilityKind::Deprecated);
+          defaultCtor->getAttrs().add(attr);
+        }
       }
 
       // We can assume that it is possible to correctly construct the object by

lib/ClangImporter/SwiftDeclSynthesizer.cpp

@@ -438,10 +438,6 @@ synthesizeStructDefaultConstructorBody(AbstractFunctionDecl *afd,
   ASTContext &ctx = constructor->getASTContext();
   auto structDecl = static_cast<StructDecl *>(context);
 
-  // We should call into C++ constructors directly.
-  assert(!isa<clang::CXXRecordDecl>(structDecl->getClangDecl()) &&
-         "Should not synthesize a C++ object constructor.");
-
   // Use a builtin to produce a zero initializer, and assign it to self.
 
   // Construct the left-hand reference to self.

test/Interop/Cxx/class/constructors-module-interface.swift

@@ -20,9 +20,13 @@
 // CHECK-NEXT: }
 // CHECK-NEXT: struct ConstructorWithParam {
 // CHECK-NEXT:   init(_ val: Int32)
+// CHECK-NEXT:   @available(*, deprecated, message
+// CHECK-NEXT:   init()
 // CHECK-NEXT:   var x: Int32
 // CHECK-NEXT: }
 // CHECK-NEXT: struct CopyAndMoveConstructor {
+// CHECK-NEXT:   @available(*, deprecated, message
+// CHECK-NEXT:   init()
 // CHECK-NEXT: }
 // CHECK-NEXT: struct Base {
 // CHECK-NEXT:   init()
@@ -38,10 +42,14 @@
 // CHECK-NEXT: }
 // CHECK:      struct TemplatedConstructor {
 // CHECK-NEXT:   init<T>(_ value: T)
+// CHECK-NEXT:   @available(*, deprecated, message
+// CHECK-NEXT:   init()
 // CHECK-NEXT:   var value: ArgType
 // CHECK-NEXT: }
 // CHECK:      struct TemplatedConstructorWithExtraArg {
 // CHECK-NEXT:   init<T>(_: Int32, _ value: T)
 // CHECK-NEXT:   init<T>(_ value: T, _: Int32)
 // CHECK-NEXT:   init<T, U>(_ value: T, _ other: U)
+// CHECK-NEXT:   @available(*, deprecated, message
+// CHECK-NEXT:   init()
 // CHECK-NEXT: }

test/Interop/Cxx/class/constructors-objc-module-interface.swift

@@ -7,4 +7,6 @@
 
 // CHECK:      struct ConstructorWithNSArrayParam {
 // CHECK-NEXT:   init(_ array: [Any]!)
+// CHECK-NEXT:   @available(*, deprecated, message
+// CHECK-NEXT:   init()
 // CHECK-NEXT: }

test/Interop/Cxx/class/constructors-typechecker.swift

@@ -6,7 +6,7 @@ let explicit = ExplicitDefaultConstructor()
 
 let implicit = ImplicitDefaultConstructor()
 
-let deletedImplicitly = ConstructorWithParam() // expected-error {{missing argument for parameter #1 in call}}
+let deletedImplicitly = ConstructorWithParam() // expected-warning {{'init()' is deprecated}}
 
 let deletedExplicitly = DefaultConstructorDeleted() // expected-error {{missing argument for parameter 'a' in call}}
 

test/Interop/Cxx/union/anonymous-union-partly-invalid-module-interface.swift

@@ -3,6 +3,8 @@
 // CHECK: class C {
 // CHECK-NEXT: }
 // CHECK-NEXT: struct S {
+// CHECK-NEXT:   @available(*, deprecated, message
+// CHECK-NEXT:   init()
 // CHECK-NEXT:   mutating func f() -> Int32
 // CHECK-NEXT: }
 // CHECK-NEXT: func getSPtr() -> UnsafeMutablePointer<S>!