re PR c++/28710 (ICE redeclaring template as non-template)

	PR c++/28710
	* decl.c (xref_tag): Improve error message.  Return early on error.

	* g++.dg/template/redecl4.C: New test.

From-SVN: r116211

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 650e393cbc0da68ea98b7142d5fbe252ce29bb44..94de8b7afaaaa5a45af5ceaf1ded81b73987203b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-17  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+       PR c++/28710
+       * decl.c (xref_tag): Improve error message.  Return early on error.
+
        PR c++/28711
        * pt.c (tsubst_copy_and_build) <case CONSTRUCTOR>: Robustify.
 

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b03ea62a2ede5b02d59dcc7efe8a3e1d45bce55e..a8ec398e1ffa357950ba8378d15e4fb916e6b514 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9695,7 +9695,8 @@ xref_tag (enum tag_types tag_code, tree name,
               && CLASSTYPE_IS_TEMPLATE (t))
        {
          error ("redeclaration of %qT as a non-template", t);
-         t = error_mark_node;
+         error ("previous declaration %q+D", t);
+         POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, error_mark_node);
        }
 
       /* Make injected friend class visible.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6805eb1e6a32f92a14ae5473a64bc3f3f3f50898..5824e853317e5675a0f66843f2651936726b864e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-17  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+       PR c++/28710
+       * g++.dg/template/redecl4.C: New test.
+
        PR c++/28711
        * g++.dg/template/ctor8.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/template/redecl4.C b/gcc/testsuite/g++.dg/template/redecl4.C
new file mode 100644 (file)
index 0000000..9a4a9f3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/redecl4.C
@@ -0,0 +1,5 @@
+// PR c++/28710
+// { dg-do compile }
+
+template<int> union A;  // { dg-error "previous" }
+struct A;               // { dg-error "non-template" }