procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: __FUNCTION__ in lambda return type [PR118629]

Browse source 
In this testcase, the use of __FUNCTION__ is within a function parameter
scope, the lambda's.  And P1787 changed __func__ to live in the parameter
scope.  But [basic.scope.pdecl] says that the point of declaration of
__func__ is immediately before {, so in the trailing return type it isn't in
scope yet, so this __FUNCTION__ should refer to foo().

Looking first for a block scope, then a function parameter scope, gives us
the right result.

	PR c++/118629

gcc/cp/ChangeLog:

	* name-lookup.cc (pushdecl_outermost_localscope): Look for an
	sk_block.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp0x/lambda/lambda-__func__3.C: New test.
This commit is contained in:
Jason Merrill 2025-04-04 17:34:08 -04:00
parent 2f62e66e14
commit 7d56182052
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/cp/name-lookup.cc
View file

@ -5204,9 +5204,11 @@ pushdecl_outermost_localscope (tree x)
cp_binding_level *b = NULL;
auto_cond_timevar tv (TV_NAME_LOOKUP);
/* Find the scope just inside the function parms. */
for (cp_binding_level *n = current_binding_level;
n->kind != sk_function_parms; n = b->level_chain)
/* Find the block scope just inside the function parms. */
cp_binding_level *n = current_binding_level;
while (n && n->kind != sk_block)
n = n->level_chain;
for (; n && n->kind != sk_function_parms; n = b->level_chain)
b = n;
return b ? do_pushdecl_with_scope (x, b) : error_mark_node;

6
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-__func__3.C Normal file
View file

@ -0,0 +1,6 @@
// PR c++/118629
// { dg-do compile { target c++11 } }
void foo() {
[]() -> decltype(+__FUNCTION__) { return nullptr; };
}