Polish

Author: hlopko

test/Interop/Cxx/templates/Inputs/SwiftClassInstantiationInNamespaceModule.swift renamed to test/Interop/Cxx/templates/Inputs/SwiftClassTemplateInNamespaceModule.swift

@@ -1,4 +1,4 @@
-import ClassTemplateInNamespace
+import ClassTemplateInNamespaceForSwiftModule
 
 public func receiveShip(_ i: inout Space.Ship<Bool>) {}
 

test/Interop/Cxx/templates/Inputs/class-template-in-namespace-for-swift-module.h

@@ -0,0 +1,24 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_FOR_SWIFT_MODULE_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_FOR_SWIFT_MODULE_H
+
+namespace Space {
+    template <class T> struct Ship { T t; };
+} // namespace Space
+
+namespace Engine {
+    struct Turbojet {};
+} // namespace Engine
+
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_FOR_SWIFT_MODULE_H
+
+// RUN: %target-swift-ide-test -print-module -module-to-print=ClassTemplateInNamespace -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// CHECK: enum Space {
+// CHECK:   struct Ship<T> {
+// CHECK:   }
+// CHECK: }
+// CHECK: enum Engine {
+// CHECK:   struct Turbojet {
+// CHECK:     init()
+// CHECK:   }
+// CHECK: }

test/Interop/Cxx/templates/Inputs/class-template-in-namespace.h

@@ -2,11 +2,32 @@
 #define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_H
 
 namespace Space {
-    template <class T> struct Ship { T t; };
-} // namespace Space
 
-namespace Engine {
-    struct Turbojet {};
-} // namespace Engine
+template <class...> struct Ship;
+template <class T, class... Args> struct Ship<T(Args...)> {};
+
+using Orbiter = Ship<void(bool)>;
+
+} // namespace Space
 
 #endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_H
+
+// namespace Space {
+//     template <class T> struct Ship { T t; };
+// } // namespace Space
+
+// namespace Engine {
+//     struct Turbojet {};
+// } // namespace Engine
+
+// RUN: %target-swift-ide-test -print-module -module-to-print=ClassTemplateInNamespace -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// CHECK: enum Space {
+// CHECK:   struct Ship<T> {
+// CHECK:   }
+// CHECK: }
+// CHECK: enum Engine {
+// CHECK:   struct Turbojet {
+// CHECK:     init()
+// CHECK:   }
+// CHECK: }

test/Interop/Cxx/templates/Inputs/module.modulemap

@@ -1,3 +1,8 @@
+module FunctionTemplates {
+  header "function-templates.h"
+  requires cplusplus
+}
+
 module ClassTemplateWithPrimitiveArgument {
   header "class-template-with-primitive-argument.h"
   requires cplusplus
@@ -33,11 +38,6 @@ module ClassTemplateInstantionExistingSpecialization {
   requires cplusplus
 }
 
-module FunctionTemplates {
-  header "function-templates.h"
-  requires cplusplus
-}
-
 module UsingDirective {
   header "using-directive.h"
   requires cplusplus
@@ -98,6 +98,11 @@ module ClassTemplateInNamespace {
   requires cplusplus
 }
 
+module ClassTemplateInNamespaceForSwiftModule {
+  header "class-template-in-namespace-for-swift-module.h"
+  requires cplusplus
+}
+
 module MemberTemplates {
   header "member-templates.h"
   requires cplusplus

test/Interop/Cxx/templates/class-template-in-namespace-module-interface.swift

@@ -1,11 +1,8 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=ClassTemplateInNamespace -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
 
 // CHECK: enum Space {
-// CHECK:   struct Ship<T> {
-// CHECK:   }
-// CHECK: }
-// CHECK: enum Engine {
-// CHECK:   struct Turbojet {
+// CHECK:   struct __CxxTemplateInstN5Space4ShipIJFvbEEEE {
 // CHECK:     init()
 // CHECK:   }
+// CHECK:   typealias Orbiter = Space.__CxxTemplateInstN5Space4ShipIJFvbEEEE
 // CHECK: }

test/Interop/Cxx/templates/swift-class-instantiation-in-namespace-module-interface.swift

@@ -1,8 +1,8 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swiftxx-frontend -emit-module -o %t/SwiftClassTemplateInNamespaceModule.swiftmodule %S/Inputs/SwiftClassInstantiationInNamespaceModule.swift -I %S/Inputs -enable-library-evolution -swift-version 5
+// RUN: %target-swiftxx-frontend -emit-module -o %t/SwiftClassTemplateInNamespaceModule.swiftmodule %S/Inputs/SwiftClassTemplateInNamespaceModule.swift -I %S/Inputs -enable-library-evolution -swift-version 5
 // RUN: %target-swift-ide-test -print-module -module-to-print=SwiftClassTemplateInNamespaceModule -I %t/ -source-filename=x -enable-cxx-interop | %FileCheck %s
 
-// CHECK: import ClassTemplateInNamespace
+// CHECK: import ClassTemplateInNamespaceForSwiftModule
 // CHECK: func receiveShip(_ i: inout Space.__CxxTemplateInstN5Space4ShipIbEE)
 // CHECK: func receiveShipWithEngine(_ i: inout Space.__CxxTemplateInstN5Space4ShipIN6Engine8TurbojetEEE)