[modules] When loading in multiple canonical definitions of a template,

accumulate the set of specializations rather than overwriting one list
with another.

llvm-svn: 230712

3 files changed, 14 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/merge-decl-context/a.h b/clang/test/Modules/Inputs/merge-decl-context/a.h
index bd08ecaf417..89cc7120fd1 100644
--- a/clang/test/Modules/Inputs/merge-decl-context/a.h
+++ b/clang/test/Modules/Inputs/merge-decl-context/a.h
@@ -8,6 +8,8 @@ struct A {
   }
   A(double) {}
   A(double, double) {}
+  A(double, int) {}
+  A(int, double) {}
 };
 
 template <typename T1, typename T2>
diff --git a/clang/test/Modules/Inputs/merge-decl-context/d.h b/clang/test/Modules/Inputs/merge-decl-context/d.h
new file mode 100644
index 00000000000..ccc7308b249
--- /dev/null
+++ b/clang/test/Modules/Inputs/merge-decl-context/d.h
@@ -0,0 +1,7 @@
+#ifndef D_H
+#define D_H
+
+#include "a.h"
+#include "b.h"
+
+#endif
diff --git a/clang/test/Modules/Inputs/merge-decl-context/merge-decl-context.modulemap b/clang/test/Modules/Inputs/merge-decl-context/merge-decl-context.modulemap
index fedc5dfbbe4..46f69548bc6 100644
--- a/clang/test/Modules/Inputs/merge-decl-context/merge-decl-context.modulemap
+++ b/clang/test/Modules/Inputs/merge-decl-context/merge-decl-context.modulemap
@@ -11,3 +11,8 @@ module "c" {
   export *
   header "c.h"
 }
+
+module "d" {
+  export *
+  header "d.h"
+}