From 96d51cc69a0471bc992753e1ce44390a1d6ea177 Mon Sep 17 00:00:00 2001
From: Marcel Hlopko <hlopko@google.com>
Date: Wed, 7 Oct 2020 11:52:00 +0200
Subject: [PATCH] Add tests testing more complicated template scenarios for
 #32950.

Specifically:

* class template with variadic parameter
* class template with non-type parameter
* class template with template template parameter
---
 .../class-template-non-type-parameter.h       | 11 +++++++
 .../class-template-template-parameter.h       | 23 ++++++++++++++
 .../Inputs/class-template-variadic.h          | 30 +++++++++++++++++++
 .../Cxx/templates/Inputs/module.modulemap     | 12 ++++++++
 .../class-template-non-type-parameter.swift   | 15 ++++++++++
 .../class-template-template-parameter.swift   | 17 +++++++++++
 .../templates/class-template-variadic.swift   | 27 +++++++++++++++++
 test/Interop/Cxx/templates/demangling.swift   | 12 ++++++++
 8 files changed, 147 insertions(+)
 create mode 100644 test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h
 create mode 100644 test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h
 create mode 100644 test/Interop/Cxx/templates/Inputs/class-template-variadic.h
 create mode 100644 test/Interop/Cxx/templates/class-template-non-type-parameter.swift
 create mode 100644 test/Interop/Cxx/templates/class-template-template-parameter.swift
 create mode 100644 test/Interop/Cxx/templates/class-template-variadic.swift
 create mode 100644 test/Interop/Cxx/templates/demangling.swift

diff --git a/test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h b/test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h
new file mode 100644
index 0000000000000..1727b1849fcba
--- /dev/null
+++ b/test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h
@@ -0,0 +1,11 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
+
+template<class T, auto Size>
+struct MagicArray {
+    T t[Size];
+};
+
+typedef MagicArray<int, 2> MagicIntPair;
+
+#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h b/test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h
new file mode 100644
index 0000000000000..913c30ddaa92c
--- /dev/null
+++ b/test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h
@@ -0,0 +1,23 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
+
+struct IntWrapper {
+  int value;
+  int getValue() const { return value; }
+};
+
+template<class T>
+struct MagicWrapper {
+  T t;
+  int getValuePlusArg(int arg) const { return t.getValue() + arg; }
+};
+
+template<template <class> class V>
+struct TemplatedMagicWrapper {
+  V<IntWrapper> i;
+  int getValuePlusTwiceTheArg(int arg) const { return i.getValuePlusArg(arg) + arg; }
+};
+
+typedef TemplatedMagicWrapper<MagicWrapper> TemplatedWrappedMagicInt;
+typedef MagicWrapper<IntWrapper> WrappedMagicInt;
+#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-variadic.h b/test/Interop/Cxx/templates/Inputs/class-template-variadic.h
new file mode 100644
index 0000000000000..26bfd176ef78c
--- /dev/null
+++ b/test/Interop/Cxx/templates/Inputs/class-template-variadic.h
@@ -0,0 +1,30 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
+
+template <class... Ts> struct Tuple {};
+
+template <>
+struct Tuple<> {
+  void set() {}
+};
+
+template <class T, class... Ts>
+struct Tuple<T, Ts...> : Tuple<Ts...> {
+  Tuple(T t, Ts... ts) : Tuple<Ts...>(ts...), _t(t) {}
+
+  void set(T t, Ts... ts) { _t = t; Tuple<Ts...>::set(ts...); }
+
+  T first() { return _t; }
+  Tuple<Ts...> rest() { return *this; }
+
+  T _t;
+};
+
+struct IntWrapper {
+  int value;
+  int getValue() const { return value; }
+};
+
+typedef Tuple<IntWrapper, IntWrapper> Pair;
+
+#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
diff --git a/test/Interop/Cxx/templates/Inputs/module.modulemap b/test/Interop/Cxx/templates/Inputs/module.modulemap
index ca82db18fc25f..2c14094815dfe 100644
--- a/test/Interop/Cxx/templates/Inputs/module.modulemap
+++ b/test/Interop/Cxx/templates/Inputs/module.modulemap
@@ -37,3 +37,15 @@ module Mangling {
 module LinkageOfSwiftSymbolsForImportedTypes {
   header "linkage-of-swift-symbols-for-imported-types.h"
 }
+
+module ClassTemplateVariadic {
+  header "class-template-variadic.h"
+}
+
+module ClassTemplateNonTypeParameter {
+  header "class-template-non-type-parameter.h"
+}
+
+module ClassTemplateTemplateParameter {
+  header "class-template-template-parameter.h"
+}
diff --git a/test/Interop/Cxx/templates/class-template-non-type-parameter.swift b/test/Interop/Cxx/templates/class-template-non-type-parameter.swift
new file mode 100644
index 0000000000000..b0b61f1c2480c
--- /dev/null
+++ b/test/Interop/Cxx/templates/class-template-non-type-parameter.swift
@@ -0,0 +1,15 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
+//
+// REQUIRES: executable_test
+
+import ClassTemplateNonTypeParameter
+import StdlibUnittest
+
+var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
+
+TemplatesTestSuite.test("non-type-parameter") {
+  var pair = MagicIntPair(t: (1, 2))
+  expectEqual(pair.t, (1, 2))
+}
+
+runAllTests()
diff --git a/test/Interop/Cxx/templates/class-template-template-parameter.swift b/test/Interop/Cxx/templates/class-template-template-parameter.swift
new file mode 100644
index 0000000000000..b1ce20b59b87a
--- /dev/null
+++ b/test/Interop/Cxx/templates/class-template-template-parameter.swift
@@ -0,0 +1,17 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
+//
+// REQUIRES: executable_test
+
+import ClassTemplateTemplateParameter
+import StdlibUnittest
+
+var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
+
+TemplatesTestSuite.test("template-template-parameter") {
+  let myInt = IntWrapper(value: 42)
+  var magicInt = WrappedMagicInt(t: myInt)
+  var templatedWrappedMagicInt = TemplatedWrappedMagicInt(i: magicInt)
+  expectEqual(templatedWrappedMagicInt.getValuePlusTwiceTheArg(10), 62)
+}
+
+runAllTests()
diff --git a/test/Interop/Cxx/templates/class-template-variadic.swift b/test/Interop/Cxx/templates/class-template-variadic.swift
new file mode 100644
index 0000000000000..b27af017141e9
--- /dev/null
+++ b/test/Interop/Cxx/templates/class-template-variadic.swift
@@ -0,0 +1,27 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
+//
+// REQUIRES: executable_test
+//
+// We can't yet call member functions correctly on Windows (SR-13129).
+// XFAIL: OS=windows-msvc
+
+import ClassTemplateVariadic
+import StdlibUnittest
+
+var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
+
+TemplatesTestSuite.test("variadic-class-template") {
+  let a = IntWrapper(value: 10)
+  let b = IntWrapper(value: 20)
+
+  var pair = Pair()
+  pair.set(a, b)
+
+  var pairA = pair.first()
+  var restB = pair.rest()
+  var pairB = restB.first()
+  expectEqual(pairA.getValue(), 10)
+  expectEqual(pairB.getValue(), 20)
+}
+
+runAllTests()
diff --git a/test/Interop/Cxx/templates/demangling.swift b/test/Interop/Cxx/templates/demangling.swift
new file mode 100644
index 0000000000000..da5722d0b4380
--- /dev/null
+++ b/test/Interop/Cxx/templates/demangling.swift
@@ -0,0 +1,12 @@
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | grep 'define.*swiftcc.*$' | grep -o '[[:alnum:]]*__CxxTemplateInst[[:alnum:]]*' | xargs %swift-demangle | %FileCheck %s
+
+import Mangling
+
+public func receiveInstantiation(_ i: inout WrappedMagicInt) {}
+
+public func returnInstantiation() -> WrappedMagicInt {
+  return WrappedMagicInt()
+}
+
+// CHECK: $s10demangling20receiveInstantiationyySo34__CxxTemplateInst12MagicWrapperIiEVzF ---> demangling.receiveInstantiation(inout __C.__CxxTemplateInst12MagicWrapperIiE) -> ()
+// CHECK: $s10demangling19returnInstantiationSo34__CxxTemplateInst12MagicWrapperIiEVyF ---> demangling.returnInstantiation() -> __C.__CxxTemplateInst12MagicWrapperIiE