From d07c152ba6fc96dd1a7581e1fc379764bf4a4150 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 11 Jan 2019 22:37:01 +0000
Subject: [PATCH] 	PR c++/88312 - pack expansion of decltype.

The standard doesn't really talk about an expression depending on the number
of elements of a pack, but that's definitely an important form of template
argument dependence.

	* pt.c (instantiation_dependent_r): A template non-type parameter
	pack is instantiation-dependent.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267860 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                                | 6 ++++++
 gcc/cp/pt.c                                     | 2 ++
 gcc/testsuite/g++.dg/cpp0x/variadic-decltype1.C | 9 +++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic-decltype1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9208f1e4937a..0eb669b3eac2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/88312 - pack expansion of decltype.
+	* pt.c (instantiation_dependent_r): A template non-type parameter
+	pack is instantiation-dependent.
+
 2019-01-11  Jason Merrill  <jason@redhat.com>
 
 	PR c++/88613 - ICE with use of const var in lambda.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 84f59a2c3561..f062a2b9707d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -25736,6 +25736,8 @@ instantiation_dependent_r (tree *tp, int *walk_subtrees,
     case TEMPLATE_PARM_INDEX:
       if (dependent_type_p (TREE_TYPE (*tp)))
 	return *tp;
+      if (TEMPLATE_PARM_PARAMETER_PACK (*tp))
+	return *tp;
       /* We'll check value-dependence separately.  */
       return NULL_TREE;
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-decltype1.C b/gcc/testsuite/g++.dg/cpp0x/variadic-decltype1.C
new file mode 100644
index 000000000000..c87c6bad59f1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-decltype1.C
@@ -0,0 +1,9 @@
+// PR c++/88555
+// { dg-do compile { target c++11 } }
+
+template <class ...> struct T {};
+
+template <int ...Indices>
+void test() {
+    using Test = T<decltype((Indices, char(0)))...>;
+}
-- 
2.39.5