Merge common pointers for redeclarations of the same template across modules.
llvm-svn: 192560
diff --git a/clang/test/Modules/Inputs/cxx-templates-a.h b/clang/test/Modules/Inputs/cxx-templates-a.h
index 37e3426..d2261f6a 100644
--- a/clang/test/Modules/Inputs/cxx-templates-a.h
+++ b/clang/test/Modules/Inputs/cxx-templates-a.h
@@ -30,3 +30,6 @@
SomeTemplate<char[1]> b, c;
b = c;
}
+
+template<int> struct MergeTemplates;
+MergeTemplates<0> *merge_templates_a;
diff --git a/clang/test/Modules/Inputs/cxx-templates-b.h b/clang/test/Modules/Inputs/cxx-templates-b.h
index c495074..6cc951b 100644
--- a/clang/test/Modules/Inputs/cxx-templates-b.h
+++ b/clang/test/Modules/Inputs/cxx-templates-b.h
@@ -17,6 +17,9 @@
extern DefinedInCommon &defined_in_common;
+template<int> struct MergeTemplates;
+MergeTemplates<0> *merge_templates_b;
+
@import cxx_templates_b_impl;
template<typename T, typename> struct Identity { typedef T type; };
diff --git a/clang/test/Modules/cxx-templates.cpp b/clang/test/Modules/cxx-templates.cpp
index f34a2bd..911f953 100644
--- a/clang/test/Modules/cxx-templates.cpp
+++ b/clang/test/Modules/cxx-templates.cpp
@@ -69,6 +69,8 @@
// expected-error@Inputs/cxx-templates-a.h:19 {{definition of 'DefinedInBImpl' must be imported}}
// expected-note@Inputs/cxx-templates-b-impl.h:1 {{definition is here}}
PerformDelayedLookup(defined_in_b_impl); // expected-note {{in instantiation of}}
+
+ merge_templates_a = merge_templates_b; // ok, same type
}
RedeclaredAsFriend<int> raf1;