2 files changed, 35 insertions, 17 deletions
diff --git a/clang/test/CodeGenCXX/crash.cpp b/clang/test/CodeGenCXX/crash.cpp
new file mode 100644
index 00000000000..073542dd15b
--- /dev/null
+++ b/clang/test/CodeGenCXX/crash.cpp
@@ -0,0 +1,35 @@
+// RUN: %clang_cc1 %s -std=c++11 -emit-llvm-only
+// CHECK that we don't crash.
+
+// PR11676's example is ill-formed:
+/*
+union _XEvent {
+};
+void ProcessEvent() {
+  _XEvent pluginEvent = _XEvent();
+}
+*/
+
+// Example from PR11665:
+void f() {
+  union U { int field; } u = U();
+  (void)U().field;
+}
+
+namespace PR17476 {
+struct string {
+  string(const char *__s);
+  string &operator+=(const string &__str);
+};
+
+template <class ELFT> void finalizeDefaultAtomValues() {
+  auto startEnd = [&](const char * sym)->void {
+    string start("__");
+    start += sym;
+  }
+  ;
+  startEnd("preinit_array");
+}
+
+void f() { finalizeDefaultAtomValues<int>(); }
+}
diff --git a/clang/test/CodeGenCXX/pr11676.cpp b/clang/test/CodeGenCXX/pr11676.cpp
deleted file mode 100644
index 896751ad6e3..00000000000
--- a/clang/test/CodeGenCXX/pr11676.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %clang_cc1 %s -std=c++11 -emit-llvm-only
-// CHECK that we don't crash.
-
-// PR11676's example is ill-formed:
-/*
-union _XEvent {
-};
-void ProcessEvent() {
-  _XEvent pluginEvent = _XEvent();
-}
-*/
-
-// Example from PR11665:
-void f() {
-  union U { int field; } u = U();
-  (void)U().field;
-}