From: Jason Merrill <jason@redhat.com>
Date: Tue, 13 Mar 2018 18:57:10 +0000 (-0400)
Subject: PR c++/84839 - ICE with decltype of parameter pack.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a651578441d84a733aa2f5efc62315a3baccbc0a;p=gcc.git

PR c++/84839 - ICE with decltype of parameter pack.

	* pt.c (tsubst_pack_expansion): Set cp_unevaluated_operand while
	instantiating dummy parms.

From-SVN: r258500
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0da60a3e99b..6e2958bc8e9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2018-03-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/84839 - ICE with decltype of parameter pack.
+	* pt.c (tsubst_pack_expansion): Set cp_unevaluated_operand while
+	instantiating dummy parms.
+
 	* parser.c (cp_parser_simple_type_specifier): Pedwarn about auto
 	parameter even without -Wpedantic.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4640ca08ce0..fdc1c9a7a75 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -11717,7 +11717,9 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain,
 	    {
 	      /* This parameter pack was used in an unevaluated context.  Just
 		 make a dummy decl, since it's only used for its type.  */
+	      ++cp_unevaluated_operand;
 	      arg_pack = tsubst_decl (parm_pack, args, complain);
+	      --cp_unevaluated_operand;
 	      if (arg_pack && DECL_PACK_P (arg_pack))
 		/* Partial instantiation of the parm_pack, we can't build
 		   up an argument pack yet.  */
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-nested2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-nested2.C
new file mode 100644
index 00000000000..ce18f99ea50
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-nested2.C
@@ -0,0 +1,9 @@
+// PR c++/84839
+// { dg-do compile { target c++11 } }
+
+template<typename... T>
+struct S {
+    using fptr = void(*)(T... x, decltype(x)... y);
+};
+
+using F = S<int>::fptr;