re PR c++/60219 ([c++11] ICE invalid use of variadic template)

	PR c++/60219
	* pt.c (coerce_template_parms): Bail if argument packing fails.

From-SVN: r208007

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 69cf400be9f1329287d1ae4ba90fe0f15244aa19..da19925f76f519a5191063c590289a8d3a27551d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2014-02-21  Jason Merrill  <jason@redhat.com>
 
+       PR c++/60219
+       * pt.c (coerce_template_parms): Bail if argument packing fails.
+
        PR c++/60248
        * mangle.c (mangle_decl): Don't make an alias for a TYPE_DECL.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 23e8c1d345c6bb53d5b5fbabac0809016e1f686c..e6e98a4e1aa130b373368987e29c543d7197da6a 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6677,6 +6677,8 @@ coerce_template_parms (tree parms,
           /* Store this argument.  */
           if (arg == error_mark_node)
             lost++;
+         if (lost)
+           break;
           TREE_VEC_ELT (new_inner_args, parm_idx) = arg;
 
          /* We are done with all of the arguments.  */

diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic150.C b/gcc/testsuite/g++.dg/cpp0x/variadic150.C
new file mode 100644 (file)
index 0000000..6a30efe
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic150.C
@@ -0,0 +1,9 @@
+// PR c++/60219
+// { dg-require-effective-target c++11 }
+
+template<typename..., int> void foo();
+
+void bar()
+{
+  foo<0>;                      // { dg-error "" }
+}