From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 5EFE43857C43; Tue, 26 Apr 2022 03:54:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5EFE43857C43 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-8258] c++: generic lambda fn parm pack [PR104624] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: c83b9c54d9dee2dce5d8268472a745b013d166cc X-Git-Newrev: 65735d21ac410463126114c572999682f987972c Message-Id: <20220426035409.5EFE43857C43@sourceware.org> Date: Tue, 26 Apr 2022 03:54:09 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2022 03:54:09 -0000 https://gcc.gnu.org/g:65735d21ac410463126114c572999682f987972c commit r12-8258-g65735d21ac410463126114c572999682f987972c Author: Jason Merrill Date: Thu Apr 21 17:24:07 2022 -0400 c++: generic lambda fn parm pack [PR104624] Parameter packs from the enclosing context can be used unexpanded in a lambda that is itself part of a pack expansion, but not packs that are part of the lambda itself. We already check for capture packs; we also need to check for function parameter packs of the lambda call operator. PR c++/104624 gcc/cp/ChangeLog: * pt.cc (check_for_bare_parameter_packs): Check for lambda function parameter pack. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/lambda-generic-variadic22.C: New test. Diff: --- gcc/cp/pt.cc | 4 +++- gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 7dd9e6788f4..a77b3166818 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -4341,7 +4341,9 @@ check_for_bare_parameter_packs (tree t, location_t loc /* = UNKNOWN_LOCATION */) parameter_packs = TREE_CHAIN (parameter_packs)) { tree pack = TREE_VALUE (parameter_packs); - if (is_capture_proxy (pack)) + if (is_capture_proxy (pack) + || (TREE_CODE (pack) == PARM_DECL + && DECL_CONTEXT (DECL_CONTEXT (pack)) == lam)) break; } diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C new file mode 100644 index 00000000000..670c598a865 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-variadic22.C @@ -0,0 +1,15 @@ +// PR c++/104624 +// { dg-do compile { target c++14 } } + +template +auto f (T) +{ + auto a = [](auto ... i) // { dg-prune-output "incomplete type" } + { + int x[][i] = { 0 }; // { dg-error "not expanded" } + }(); +} +void g () +{ + f(0); +}