MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++: mangling of lambdas in default args [PR91241]

Browse Source 
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.
This commit is contained in:
Jason Merrill 2021-04-05 22:50:44 -04:00
parent 66de517b1c
commit 55f40d968b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/cp/mangle.c
View File

@ -1628,6 +1628,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 ('_');
@ -2027,15 +2028,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);
}

11
gcc/testsuite/g++.dg/abi/lambda-defarg1.C Normal file
View File

@ -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" } }