From 56992a78837dbe2180e3d7a75a17289e2897a115 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sun, 15 Apr 2012 23:18:17 -0400
Subject: [PATCH] re PR c++/47220 ([C++0x] no error on unterminated template
 argument list for variadic parameter)

	PR c++/47220
	* pt.c (coerce_template_parameter_pack): Check for error_mark_node.

From-SVN: r186480
---
 gcc/cp/ChangeLog                            | 3 +++
 gcc/cp/pt.c                                 | 7 ++++++-
 gcc/testsuite/ChangeLog                     | 3 +++
 gcc/testsuite/g++.dg/cpp0x/pr39639.C        | 1 +
 gcc/testsuite/g++.dg/cpp0x/variadic126.C    | 8 ++++++++
 gcc/testsuite/g++.dg/debug/dwarf2/pr52260.C | 4 ++--
 6 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic126.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d37d42c0264..893ce5639a9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-15  Jason Merrill  <jason@redhat.com>
 
+	PR c++/47220
+	* pt.c (coerce_template_parameter_pack): Check for error_mark_node.
+
 	PR c++/52292
 	PR c++/52380
 	* pt.c (coerce_template_parms): Even if we aren't converting we
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 42dc0a74439..95d0aba0534 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6697,7 +6697,12 @@ coerce_template_parameter_pack (tree parms,
             TREE_VEC_ELT (packed_types, arg_idx - parm_idx);
         }
 
-      if (arg != error_mark_node)
+      if (arg == error_mark_node)
+	{
+	  if (complain & tf_error)
+	    error ("template argument %d is invalid", arg_idx + 1);
+	}
+      else
 	arg = convert_template_argument (actual_parm, 
 					 arg, new_args, complain, parm_idx,
 					 in_decl);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a936b368ce0..321adb379c4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-15  Jason Merrill  <jason@redhat.com>
 
+	PR c++/47220
+	* g++.dg/cpp0x/variadic126.C: New.
+
 	PR c++/52380
 	* g++.dg/cpp0x/variadic125.C: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr39639.C b/gcc/testsuite/g++.dg/cpp0x/pr39639.C
index 4fd8b56fd30..0838a0ba25f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/pr39639.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr39639.C
@@ -2,6 +2,7 @@
 // Origin: PR c++/39639
 // { dg-do compile }
 // { dg-options "-std=c++0x" }
+// { dg-prune-output "template argument 1 is invalid" }
 
 template <class... Types>
 struct S
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic126.C b/gcc/testsuite/g++.dg/cpp0x/variadic126.C
new file mode 100644
index 00000000000..513c7e54a07
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic126.C
@@ -0,0 +1,8 @@
+// PR c++/47220
+// { dg-do compile { target c++11 } }
+
+template < typename ... > struct A;
+
+struct B : A <			// { dg-error "invalid" }
+{
+};
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pr52260.C b/gcc/testsuite/g++.dg/debug/dwarf2/pr52260.C
index 9ab2589ce11..024afc8bc54 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/pr52260.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/pr52260.C
@@ -22,7 +22,7 @@ namespace A
 {
   template <typename T>
   struct I : H <T> {};
-  template <typename ...> struct J;
+  template <typename ...> struct J {};
   template <typename> struct K;
   struct L
   {
@@ -36,7 +36,7 @@ namespace A
   template <typename T, typename B2, typename ... B4>
   struct N <T (B4 ...), B2> : L::M <B2> {};
   template <typename T, typename ... B4>
-  struct K <T (B4 ...)> :J <,>, L
+  struct K <T (B4 ...)> :J <>, L
   {
     typedef T O (B4 ...);
     struct P {};
-- 
2.30.2