From 7acf7efa8947cf2990cbdc670ea3adeace4a4394 Mon Sep 17 00:00:00 2001
From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Sat, 26 Aug 2006 00:37:48 +0000
Subject: [PATCH] re PR c++/28853 (ICE on invalid declaration with template
 template parameter)

	PR c++/28853
	* typeck2.c (cxx_incomplete_type_diagnostic): Handle template
	template parameters.  Improve error message for template type
	parameters.

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

From-SVN: r116464
---
 gcc/cp/ChangeLog                      | 5 +++++
 gcc/cp/typeck2.c                      | 7 ++++++-
 gcc/testsuite/ChangeLog               | 3 +++
 gcc/testsuite/g++.dg/template/ttp21.C | 5 +++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/ttp21.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c56f75675eb..171103beca5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-25  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/28853
+	* typeck2.c (cxx_incomplete_type_diagnostic): Handle template
+	template parameters.  Improve error message for template type
+	parameters.
+
 	PR c++/28852
 	* cp-tree.h (grok_op_properties): Return bool instead of void.
 	* decl.c (grokfndecl): Discard invalid operator declarations.
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index bef448bbdf9..6d847cb1cf9 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -403,7 +403,12 @@ cxx_incomplete_type_diagnostic (tree value, tree type, int diag_type)
       break;
 
     case TEMPLATE_TYPE_PARM:
-      p_msg ("invalid use of template type parameter");
+      p_msg ("invalid use of template type parameter %qT", type);
+      break;
+
+    case BOUND_TEMPLATE_TEMPLATE_PARM:
+      p_msg ("invalid use of template template parameter %qT",
+            TYPE_NAME (type));
       break;
 
     case TYPENAME_TYPE:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8fa3f7f7893..39d2fc86507 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-25  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/28853
+	* g++.dg/template/ttp21.C: New test.
+
 	PR c++/28852
 	* g++.dg/other/operator1.C: Add error-marker.
 	* g++.dg/other/operator2.C: New test.
diff --git a/gcc/testsuite/g++.dg/template/ttp21.C b/gcc/testsuite/g++.dg/template/ttp21.C
new file mode 100644
index 00000000000..f0bda99d157
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ttp21.C
@@ -0,0 +1,5 @@
+// PR c++/28853
+// { dg-do compile }
+
+template<template<int> class A>
+int A<0>::i;  // { dg-error "template template parameter" }
-- 
2.11.4.GIT