diff options
| author | Jason Merrill <jason@redhat.com> | 2018-03-14 23:49:07 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-03-14 23:49:07 -0400 |
| commit | e62d673d7844bb3862bae57b719f83a2a42413b4 (patch) | |
| tree | e68f9cf1b8d37966c566b511223f632a00a7e942 /gcc | |
| parent | b149eb04c87823dc2f0b9f141fbbc149fd21598a (diff) | |
| download | gcc-e62d673d7844bb3862bae57b719f83a2a42413b4.zip gcc-e62d673d7844bb3862bae57b719f83a2a42413b4.tar.gz gcc-e62d673d7844bb3862bae57b719f83a2a42413b4.tar.bz2 | |
PR c++/84801 - ICE with unexpanded pack in lambda.
We avoid complaining about unexpanded packs when inside a lambda,
since the lambda as a whole could be part of a pack expansion.
But that can only be true if the lambda is in a template context.
* pt.c (check_for_bare_parameter_packs): Don't return early for a
lambda in non-template context.
From-SVN: r258548
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic15.C | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fc124b44..4a526b9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2018-03-14 Jason Merrill <jason@redhat.com> + PR c++/84801 - ICE with unexpanded pack in lambda. + * pt.c (check_for_bare_parameter_packs): Don't return early for a + lambda in non-template context. + PR c++/81236 - auto variable and auto function * pt.c (tsubst_baselink): Update the type of the BASELINK after mark_used. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2ea5fc7..32af3a4 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4043,7 +4043,8 @@ check_for_bare_parameter_packs (tree t) return false; /* A lambda might use a parameter pack from the containing context. */ - if (current_class_type && LAMBDA_TYPE_P (current_class_type)) + if (current_class_type && LAMBDA_TYPE_P (current_class_type) + && CLASSTYPE_TEMPLATE_INFO (current_class_type)) return false; if (TREE_CODE (t) == TYPE_DECL) diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic15.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic15.C new file mode 100644 index 0000000..1de7271 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic15.C @@ -0,0 +1,5 @@ +// PR c++/84801 +// { dg-do compile { target c++14 } } + +int v; +int main() { [](auto... c) { v = c; }(1); } // { dg-error "not expanded" } |