From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 27176395201C; Thu, 12 May 2022 20:14:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 27176395201C 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 r11-9988] c++: pack init-capture of unresolved overload [PR102629] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: a67bc6320d34b20fe838d479a6a1e110f1160c89 X-Git-Newrev: f0484f60e6409ef6e837e4712d212a5d827767ba Message-Id: <20220512201455.27176395201C@sourceware.org> Date: Thu, 12 May 2022 20:14:55 +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: Thu, 12 May 2022 20:14:55 -0000 https://gcc.gnu.org/g:f0484f60e6409ef6e837e4712d212a5d827767ba commit r11-9988-gf0484f60e6409ef6e837e4712d212a5d827767ba Author: Jason Merrill Date: Tue Apr 26 00:19:40 2022 -0400 c++: pack init-capture of unresolved overload [PR102629] Here we were failing to diagnose that the initializer for the capture pack is an unresolved overload. It turns out that the reason we didn't recognize the deduction failure in do_auto_deduction was that the individual 'auto' in the expansion of the capture pack was still marked as a parameter pack, so we were deducing it to an empty pack instead of failing. PR c++/102629 gcc/cp/ChangeLog: * pt.c (gen_elem_of_pack_expansion_instantiation): Clear TEMPLATE_TYPE_PARAMETER_PACK on auto. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/lambda-pack-init7.C: New test. Diff: --- gcc/cp/pt.c | 8 +++++++- gcc/testsuite/g++.dg/cpp2a/lambda-pack-init7.C | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c98acbec481..a8fa2347c8a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12642,7 +12642,13 @@ gen_elem_of_pack_expansion_instantiation (tree pattern, t = tsubst_expr (pattern, args, complain, in_decl, /*integral_constant_expression_p=*/false); else - t = tsubst (pattern, args, complain, in_decl); + { + t = tsubst (pattern, args, complain, in_decl); + if (is_auto (t) && !ith_elem_is_expansion) + /* When expanding the fake auto... pack expansion from add_capture, we + need to mark that the expansion is no longer a pack. */ + TEMPLATE_TYPE_PARAMETER_PACK (t) = false; + } /* If the Ith argument pack element is a pack expansion, then the Ith element resulting from the substituting is going to diff --git a/gcc/testsuite/g++.dg/cpp2a/lambda-pack-init7.C b/gcc/testsuite/g++.dg/cpp2a/lambda-pack-init7.C new file mode 100644 index 00000000000..f3c3899e97a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/lambda-pack-init7.C @@ -0,0 +1,18 @@ +// PR c++/102629 +// { dg-do compile { target c++20 } } + +template T&& forward(T&); +template T&& forward(T&&); + +struct S {}; + +template +void foo(Args&&... args) { + [...args = forward /*(args)*/] { // { dg-error "" } + [](auto...) { } (forward(args)...); + }; +} + +void bar( ) { + foo(S{}); +}