From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 0B738395B06C; Fri, 13 May 2022 17:13:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0B738395B06C 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 r10-10734] c++: mangling of lambdas in default args [PR91241] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: aa030fca4b7257656aa6bfe879d79a332b3c39ea X-Git-Newrev: a86e0cadefe5a2469bb9872bb5b93017ccb23935 Message-Id: <20220513171355.0B738395B06C@sourceware.org> Date: Fri, 13 May 2022 17:13: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: Fri, 13 May 2022 17:13:55 -0000 https://gcc.gnu.org/g:a86e0cadefe5a2469bb9872bb5b93017ccb23935 commit r10-10734-ga86e0cadefe5a2469bb9872bb5b93017ccb23935 Author: Jason Merrill Date: Mon Apr 5 22:50:44 2021 -0400 c++: mangling of lambdas in default args [PR91241] In this testcase, the parms remembered in LAMBDA_EXPR_EXTRA_SCOPE are no longer the parms of the FUNCTION_DECL they have as their DECL_CONTEXT, so we were mangling both lambdas as parm #0. But since the parms are numbered from right to left we don't need to need to find them in the FUNCTION_DECL, we can measure their own DECL_CHAIN. gcc/cp/ChangeLog: PR c++/91241 * mangle.c (write_compact_number): Add sanity check. (write_local_name): Use list_length for parm number. gcc/testsuite/ChangeLog: PR c++/91241 * g++.dg/abi/lambda-defarg1.C: New test. Diff: --- gcc/cp/mangle.c | 11 ++--------- gcc/testsuite/g++.dg/abi/lambda-defarg1.C | 11 +++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index cd2fdd91537..d0682e5b93a 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -1604,6 +1604,7 @@ write_literal_operator_name (tree identifier) static void write_compact_number (int num) { + gcc_checking_assert (num >= 0); if (num > 0) write_unsigned_number (num - 1); write_char ('_'); @@ -2003,15 +2004,7 @@ write_local_name (tree function, const tree local_entity, /* For this purpose, parameters are numbered from right-to-left. */ if (parm) { - tree t; - int i = 0; - for (t = DECL_ARGUMENTS (function); t; t = DECL_CHAIN (t)) - { - if (t == parm) - i = 1; - else if (i) - ++i; - } + int i = list_length (parm); write_char ('d'); write_compact_number (i - 1); } diff --git a/gcc/testsuite/g++.dg/abi/lambda-defarg1.C b/gcc/testsuite/g++.dg/abi/lambda-defarg1.C new file mode 100644 index 00000000000..8c538581240 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/lambda-defarg1.C @@ -0,0 +1,11 @@ +// PR c++/91241 +// { dg-do compile { target c++11 } } + +struct A { + int *b(const int & = []() -> int { return 0; }(), + const int & = []() -> int { return 0; }()); +}; +int *A::b(const int &, const int &) { b(); return 0; } +// { dg-final { scan-assembler "_ZN1A1bERKiS1_" } } +// { dg-final { scan-assembler "_ZZN1A1bERKiS1_Ed_NKUlvE_clEv" } } +// { dg-final { scan-assembler "_ZZN1A1bERKiS1_Ed0_NKUlvE_clEv" } }