PR c++/86728 - C variadic generic lambda.

	* parser.c (cp_parser_parameter_declaration): Don't turn 'auto' into
	a pack if it's followed by a declarator-id.

From-SVN: r263484

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8a3e15077040a92698026b23f16c6d5850657c56..fc0771aa7f2d3a81559b5eccccd14f7a0dc840d7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-10  Jason Merrill  <jason@redhat.com>
+
+       PR c++/86728 - C variadic generic lambda.
+       * parser.c (cp_parser_parameter_declaration): Don't turn 'auto' into
+       a pack if it's followed by a declarator-id.
+
 2018-08-08  Jakub Jelinek  <jakub@redhat.com>
 
        P0595R1 - is_constant_evaluated

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 93c812f80d737882e2d4b7be103c4c79878fa8fb..8cfcd150705f5a79e96fdf55ddfa4cf109294f15 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -21722,7 +21722,8 @@ cp_parser_parameter_declaration (cp_parser *parser,
      parameter was introduced during cp_parser_parameter_declaration,
      change any implicit parameters introduced into packs.  */
   if (parser->implicit_template_parms
-      && (token->type == CPP_ELLIPSIS
+      && ((token->type == CPP_ELLIPSIS
+          && declarator_can_be_parameter_pack (declarator))
          || (declarator && declarator->parameter_pack_p)))
     {
       int latest_template_parm_idx = TREE_VEC_LENGTH

diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic19.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic19.C
new file mode 100644 (file)
index 0000000..e78677d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic19.C
@@ -0,0 +1,4 @@
+// PR c++/86728
+// { dg-do compile { target c++14 } }
+
+auto c = [](auto x ...) { };