[PATCH] Fix PR c++/42054: ICE with invalid template parameter

[Simon Martin <simartin@users.sourceforge.net>]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

Hello,

The following invalid snippet causes an ICE with gcc >= 4.3

=== cut here ===
template<int int> struct A;
template<int int> struct A;
=== cut here ===

This is due to 'redeclare_class_template' not handling cases with an
invalid template argument. The attached patch fixes this by skipping
invalid template arguments.

I have successfully regtested it on 86_64-apple-darwin-9. Is it OK
for trunk?

Best regards,
     Simon

:ADDPATCH c++:



[-- Attachment #2: CL_42054 --]
[-- Type: text/plain, Size: 148 bytes --]

2009-11-22  Simon Martin  <simartin@users.sourceforge.net>

	PR c++/42054
	* pt.c (redeclare_class_template): Skip erroneous template parameters.



[-- Attachment #3: pr42054.patch --]
[-- Type: text/plain, Size: 408 bytes --]

Index: gcc/cp/pt.c
===================================================================
--- gcc/cp/pt.c	(revision 154425)
+++ gcc/cp/pt.c	(working copy)
@@ -4565,7 +4565,8 @@
 	  return false;
 	}
 
-      if (tmpl_default != NULL_TREE && parm_default != NULL_TREE)
+      if (tmpl_parm != error_mark_node
+	  && tmpl_default != NULL_TREE && parm_default != NULL_TREE)
 	{
 	  /* We have in [temp.param]:
 



[-- Attachment #4: CL_42054_testsuite --]
[-- Type: text/plain, Size: 114 bytes --]

2009-11-21  Simon Martin  <simartin@users.sourceforge.net>

	PR c++/42054:
	* g++.dg/parse/error37.C: New test.



[-- Attachment #5: error37.C --]
[-- Type: text/plain, Size: 170 bytes --]

/* PR c++/42054 */
/* { dg-do "compile" } */

template<int int> struct A; /* { dg-error "two or more" } */
template<int int> struct A; /* { dg-error "two or more" } */