From d51ed7b1337868df88ece44360b50f2d541a338a Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 30 Apr 2015 09:04:04 +0000
Subject: [PATCH] 2015-04-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/59955
	* g++.dg/template/crash121.C: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222612 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                  |  5 +++++
 gcc/testsuite/g++.dg/template/crash121.C | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/crash121.C

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7aebfecff77..4c41b242417 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/59955
+	* g++.dg/template/crash121.C: New.
+
 2015-04-29  Petar Jovanovic  <petar.jovanovic@rt-rk.com>
 
 	* gcc.target/mips/call-from-init.c: New test.
diff --git a/gcc/testsuite/g++.dg/template/crash121.C b/gcc/testsuite/g++.dg/template/crash121.C
new file mode 100644
index 00000000000..b7291df7edc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash121.C
@@ -0,0 +1,11 @@
+// PR c++/59955
+
+template< int xyz >
+struct wovo {
+
+   template< int n >
+   void us(){}
+   
+   template< int n >
+   struct us< n > {};  // { dg-error "template|conflicts" }
+};
-- 
2.11.4.GIT