From 18a6a2d58cef24b9c73bd6d3485c21afbcb6238a Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Mon, 23 Feb 2009 22:34:50 +0000
Subject: gcc/cp

2009-02-23  H.J. Lu  <hongjiu.lu@intel.com>

	PR c++/36411
	* pt.c (coerce_template_template_parms): Return 0 if parameter
	is error_mark_node.

gcc/testsuite/

2009-02-23  H.J. Lu  <hongjiu.lu@intel.com>

	PR c++/36411
	* g++.dg/template/void14.C: New.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@144396 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                       | 6 ++++++
 gcc/cp/pt.c                            | 3 +++
 gcc/testsuite/ChangeLog                | 5 +++++
 gcc/testsuite/g++.dg/template/void14.C | 7 +++++++
 4 files changed, 21 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/void14.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d2b2dbea0a6..0af13722a56 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c++/36411
+	* pt.c (coerce_template_template_parms): Return 0 if parameter
+	is error_mark_node.
+
 2009-02-23  Jason Merrill  <jason@redhat.com>
 
 	* pt.c (unify): Call maybe_adjust_types_for_deduction when
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7246b13c3d6..bef6002c4ff 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4756,6 +4756,9 @@ coerce_template_template_parms (tree parm_parms,
     {
       parm = TREE_VALUE (TREE_VEC_ELT (parm_parms, nparms - 1));
       
+      if (parm == error_mark_node)
+	return 0;
+
       switch (TREE_CODE (parm))
         {
         case TEMPLATE_DECL:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c6b43aec27..ac5bf2ec57d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c++/36411
+	* g++.dg/template/void14.C: New.
+
 2009-02-23  Jason Merrill  <jason@redhat.com>
 
 	PR c++/38880
diff --git a/gcc/testsuite/g++.dg/template/void14.C b/gcc/testsuite/g++.dg/template/void14.C
new file mode 100644
index 00000000000..7781c618779
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/void14.C
@@ -0,0 +1,7 @@
+// PR c++/36411
+// { dg-do compile }
+
+template<template<void> class> struct A // { dg-error "not a valid type" }
+{
+  template<template<int> class T> A<T> foo(); // { dg-error "mismatch|expected|invalid" }
+};
-- 
cgit v1.2.3