3 files changed, 20 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/cxx-templates-a.h b/clang/test/Modules/Inputs/cxx-templates-a.h
new file mode 100644
index 00000000000..52bc3a2e3ad
--- /dev/null
+++ b/clang/test/Modules/Inputs/cxx-templates-a.h
@@ -0,0 +1,6 @@
+template<typename T> T f() { return T(); }
+template<typename T> T f(T);
+namespace N {
+  template<typename T> T f() { return T(); }
+  template<typename T> T f(T);
+}
diff --git a/clang/test/Modules/Inputs/cxx-templates-b.h b/clang/test/Modules/Inputs/cxx-templates-b.h
new file mode 100644
index 00000000000..3cc940c2c40
--- /dev/null
+++ b/clang/test/Modules/Inputs/cxx-templates-b.h
@@ -0,0 +1,6 @@
+template<typename T> T f();
+template<typename T> T f(T t) { return t; }
+namespace N {
+  template<typename T> T f();
+  template<typename T> T f(T t) { return t; }
+}
diff --git a/clang/test/Modules/Inputs/module.map b/clang/test/Modules/Inputs/module.map
index 65c75fdc1c6..d2ed75830b8 100644
--- a/clang/test/Modules/Inputs/module.map
+++ b/clang/test/Modules/Inputs/module.map
@@ -188,6 +188,14 @@ module cxx_linkage_cache {
   header "cxx-linkage-cache.h"
 }
 
+module cxx_templates_a {
+  header "cxx-templates-a.h"
+}
+
+module cxx_templates_b {
+  header "cxx-templates-b.h"
+}
+
 module config {
   header "config.h"
   config_macros [exhaustive] WANT_FOO, WANT_BAR