Merge pull request #31657 from MForster/m/memberwise-initializer

Synthesize memberwise initializers despite member functions

Author: gribozavr

lib/ClangImporter/ImportDecl.cpp

@@ -3348,8 +3348,8 @@ namespace {
 
         auto member = Impl.importDecl(nd, getActiveSwiftVersion());
         if (!member) {
-          if (!isa<clang::TypeDecl>(nd)) {
-            // We don't know what this field is.
+          if (!isa<clang::TypeDecl>(nd) && !isa<clang::FunctionDecl>(nd)) {
+            // We don't know what this member is.
             // Assume it may be important in C.
             hasUnreferenceableStorage = true;
             hasMemberwiseInitializer = false;

test/Interop/Cxx/class/Inputs/memberwise-initializer.h

@@ -21,6 +21,11 @@ struct StructPublicAndPrivate {
   int varPrivate;
 };
 
+struct StructWithUnimportedMemberFunction {
+  int varPublic;
+  int StructWithUnimportedMemberFunction::* unimportedMemberFunction();
+};
+
 class ClassPrivateOnly {
   int varPrivate;
 };
@@ -41,4 +46,10 @@ class ClassPrivateAndPublic {
   int varPublic;
 };
 
+struct ClassWithUnimportedMemberFunction {
+public:
+  int varPublic;
+  int ClassWithUnimportedMemberFunction::* unimportedMemberFunction();
+};
+
 #endif

test/Interop/Cxx/class/memberwise-initializer-module-interface.swift

@@ -17,6 +17,11 @@
 // CHECK-NEXT:   var varPublic: Int32
 // CHECK-NEXT:   init()
 // CHECK-NEXT: }
+// CHECK-NEXT: struct StructWithUnimportedMemberFunction {
+// CHECK-NEXT:   var varPublic: Int32
+// CHECK-NEXT:   init()
+// CHECK-NEXT:   init(varPublic: Int32)
+// CHECK-NEXT: }
 // CHECK-NEXT: struct ClassPrivateOnly {
 // CHECK-NEXT:   init()
 // CHECK-NEXT: }
@@ -32,3 +37,8 @@
 // CHECK-NEXT:   var varPublic: Int32
 // CHECK-NEXT:   init()
 // CHECK-NEXT: }
+// CHECK-NEXT: struct ClassWithUnimportedMemberFunction {
+// CHECK-NEXT:   var varPublic: Int32
+// CHECK-NEXT:   init()
+// CHECK-NEXT:   init(varPublic: Int32)
+// CHECK-NEXT: }

test/Interop/Cxx/class/memberwise-initializer-typechecker.swift

@@ -7,9 +7,11 @@ let structPublicOnly = StructPublicOnly(varPublic: 42)
 let structEmptyPrivateSetion = StructEmptyPrivateSection(varPublic: 42)
 let structPublicAndPrivate1 = StructPublicAndPrivate(varPublic: 42)  // expected-error {{argument passed to call that takes no arguments}}
 let structPublicAndPrivate2 = StructPublicAndPrivate(varPublic: 42, varPrivate: 23)  // expected-error {{argument passed to call that takes no arguments}}
+let structWithUnimportedMemberFunction = StructWithUnimportedMemberFunction(varPublic: 42)
 
 let classPrivateOnly = ClassPrivateOnly(varPrivate: 42) // expected-error {{argument passed to call that takes no arguments}}
 let classPublicOnly = ClassPublicOnly(varPublic: 42)
 let classEmptyPublicSetion = ClassEmptyPublicSection(varPrivate: 42) // expected-error {{argument passed to call that takes no arguments}}
 let classPublicAndPrivate1 = ClassPrivateAndPublic(varPublic: 23)  // expected-error {{argument passed to call that takes no arguments}}
 let classPublicAndPrivate2 = ClassPrivateAndPublic(varPrivate: 42, varPublic: 23)  // expected-error {{argument passed to call that takes no arguments}}
+let classWithUnimportedMemberFunction = ClassWithUnimportedMemberFunction(varPublic: 42)