Merge pull request #67598 from apple/egorzhdan/memberwise-init

[cxx-interop] Memberwise init is not synthesized for C++ type with templated using decl

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -2236,7 +2236,9 @@ namespace {
         Decl *member = Impl.importDecl(nd, getActiveSwiftVersion());
 
         if (!member) {
-          if (!isa<clang::TypeDecl>(nd) && !isa<clang::FunctionDecl>(nd)) {
+          if (!isa<clang::TypeDecl>(nd) && !isa<clang::FunctionDecl>(nd) &&
+              !isa<clang::TypeAliasTemplateDecl>(nd) &&
+              !isa<clang::FunctionTemplateDecl>(nd)) {
             // We don't know what this member is.
             // Assume it may be important in C.
             hasUnreferenceableStorage = true;

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

@@ -1,6 +1,10 @@
 #ifndef TEST_INTEROP_CXX_CLASS_INPUTS_MEMBERWISE_INITIALIZER_H
 #define TEST_INTEROP_CXX_CLASS_INPUTS_MEMBERWISE_INITIALIZER_H
 
+template <typename T>
+struct TemplatedType {};
+
+
 struct StructPrivateOnly {
 private:
   int varPrivate;
@@ -52,4 +56,20 @@ struct ClassWithUnimportedMemberFunction {
   int ClassWithUnimportedMemberFunction::* unimportedMemberFunction();
 };
 
+struct ClassWithTemplatedFunction {
+public:
+  int varPublic;
+
+  template <int I>
+  void foo();
+};
+
+struct ClassWithTemplatedUsingDecl {
+public:
+  int varPublic;
+
+  template <typename T>
+  using MyUsing = TemplatedType<T>;
+};
+
 #endif

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

@@ -42,3 +42,13 @@
 // CHECK-NEXT:   init(varPublic: Int32)
 // CHECK-NEXT:   var varPublic: Int32
 // CHECK-NEXT: }
+// CHECK-NEXT: struct ClassWithTemplatedFunction {
+// CHECK-NEXT:   init()
+// CHECK-NEXT:   init(varPublic: Int32)
+// CHECK-NEXT:   var varPublic: Int32
+// CHECK-NEXT: }
+// CHECK-NEXT: struct ClassWithTemplatedUsingDecl {
+// CHECK-NEXT:   init()
+// CHECK-NEXT:   init(varPublic: Int32)
+// CHECK-NEXT:   var varPublic: Int32
+// CHECK-NEXT: }