re PR c++/28594 (ICE with invalid template parameter)

	PR c++/28594
	* pt.c (process_template_parm): Robustify.
	* g++.dg/template/void6.C: New test.

From-SVN: r116160

gcc/cp/ChangeLog

+2006-08-15  Lee Millward  <lee.millward@codesourcery.com>
+
+	PR c++/28594
+	* pt.c (process_template_parm): Robustify.
+	
 2006-08-14  Steve Ellcey  <sje@cup.hp.com>
 
 	PR c++/28288

gcc/cp/pt.c

@@ -2352,19 +2352,24 @@ process_template_parm (tree list, tree parm, bool is_non_type)
 {
   tree decl = 0;
   tree defval;
-  int idx;
+  int idx = 0;
 
   gcc_assert (TREE_CODE (parm) == TREE_LIST);
   defval = TREE_PURPOSE (parm);
 
   if (list)
     {
-      tree p = TREE_VALUE (tree_last (list));
+      tree p = tree_last (list);
+
+      if (p && p != error_mark_node)
+        {
+          p = TREE_VALUE (p);
+          if (TREE_CODE (p) == TYPE_DECL || TREE_CODE (p) == TEMPLATE_DECL)
+            idx = TEMPLATE_TYPE_IDX (TREE_TYPE (p));
+          else
+            idx = TEMPLATE_PARM_IDX (DECL_INITIAL (p));
+        }
 
-      if (TREE_CODE (p) == TYPE_DECL || TREE_CODE (p) == TEMPLATE_DECL)
-	idx = TEMPLATE_TYPE_IDX (TREE_TYPE (p));
-      else
-	idx = TEMPLATE_PARM_IDX (DECL_INITIAL (p));
       ++idx;
     }
   else

gcc/testsuite/ChangeLog

+2006-08-15  Lee Millward  <lee.millward@codesourcery.com>
+
+	PR c++/28594
+	* g++.dg/template/void6.C: New test.
+	
 2006-08-15  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c/28649

gcc/testsuite/g++.dg/template/void6.C

+//PR c++/28594
+
+template<void, int> struct A; // { dg-error "not a valid type" }