re PR c++/51328 (ICE on invalid template parameter)

/cp
2011-12-19  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51328
	* pt.c (convert_template_argument): Early error out and return
	error_mark_node for invalid uses of destructors as types.

/testsuite
2011-12-19  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51328
	* g++.dg/template/crash109.C: New.

From-SVN: r182508

gcc/cp/ChangeLog

+2011-12-19  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51328
+	* pt.c (convert_template_argument): Early error out and return
+	error_mark_node for invalid uses of destructors as types.
+
 2011-12-19  Jason Merrill  <jason@redhat.com>
 
 	PR c++/51530

gcc/cp/pt.c

@@ -6445,8 +6445,16 @@ convert_template_argument (tree parm,
   if (requires_type && ! is_type && TREE_CODE (arg) == SCOPE_REF
       && TREE_CODE (TREE_OPERAND (arg, 0)) == TEMPLATE_TYPE_PARM)
     {
-      permerror (input_location, "to refer to a type member of a template parameter, "
-	         "use %<typename %E%>", orig_arg);
+      if (TREE_CODE (TREE_OPERAND (arg, 1)) == BIT_NOT_EXPR)
+	{
+	  if (complain & tf_error)
+	    error ("invalid use of destructor %qE as a type", orig_arg);
+	  return error_mark_node;
+	}
+
+      permerror (input_location,
+		 "to refer to a type member of a template parameter, "
+		 "use %<typename %E%>", orig_arg);
 
       orig_arg = make_typename_type (TREE_OPERAND (arg, 0),
 				     TREE_OPERAND (arg, 1),

gcc/testsuite/ChangeLog

+2011-12-19  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51328
+	* g++.dg/template/crash109.C: New.
+
 2011-12-19  Jason Merrill  <jason@redhat.com>
 
 	PR c++/51530

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

+// PR c++/51328
+
+template<typename T> struct A
+{
+  void foo(A<T::~T>);  // { dg-error "invalid use of destructor" }
+};