Merge templated static member variables, fixes http://llvm.org/pr26179.

Patch by Vassil Vassilev!
Reviewed by Richard Smith.

llvm-svn: 258524

4 files changed, 29 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/PR26179/A.h b/clang/test/Modules/Inputs/PR26179/A.h
new file mode 100644
index 00000000000..ce95fafb4bf
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR26179/A.h
@@ -0,0 +1,4 @@
+#include "basic_string.h"
+#include "B.h"
+
+int *p = a;
diff --git a/clang/test/Modules/Inputs/PR26179/B.h b/clang/test/Modules/Inputs/PR26179/B.h
new file mode 100644
index 00000000000..eb8d1c29e79
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR26179/B.h
@@ -0,0 +1,2 @@
+#include "basic_string.h"
+extern int a[5];
diff --git a/clang/test/Modules/Inputs/PR26179/basic_string.h b/clang/test/Modules/Inputs/PR26179/basic_string.h
new file mode 100644
index 00000000000..afd1e0d3b34
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR26179/basic_string.h
@@ -0,0 +1,14 @@
+#ifndef _GLIBCXX_STRING
+#define _GLIBCXX_STRING 1
+
+template<typename T>
+struct basic_string {
+  static T _S_empty_rep_storage[];
+};
+
+template<typename T>
+T basic_string<T>::_S_empty_rep_storage[sizeof(T)];
+
+extern int a[];
+
+#endif
diff --git a/clang/test/Modules/Inputs/PR26179/module.modulemap b/clang/test/Modules/Inputs/PR26179/module.modulemap
new file mode 100644
index 00000000000..49374181d75
--- /dev/null
+++ b/clang/test/Modules/Inputs/PR26179/module.modulemap
@@ -0,0 +1,9 @@
+module A {
+  header "A.h"
+  export *
+}
+
+module B {
+  header "B.h"
+  export *
+}