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

c++: Fix thinko in auto return type checking [PR98441]

Browse source 
This fixes a thinko in my r11-2085 patch: when I said "But only give the
!late_return_type errors when funcdecl_p, to accept e.g. auto (*fp)() = f;
in C++11" I should've done this, otherwise we give bogus errors mentioning
"function with trailing return type" when there is none.

gcc/cp/ChangeLog:

	PR c++/98441
	* decl.c (grokdeclarator): Move the !funcdecl_p check inside the
	!late_return_type block.

gcc/testsuite/ChangeLog:

	PR c++/98441
	* g++.dg/cpp0x/auto55.C: New test.
This commit is contained in:
Marek Polacek 2021-01-05 19:17:10 -05:00
parent 6c59b8a93c
commit 2f359597e4
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/cp/decl.c
View file

@ -12241,10 +12241,12 @@ grokdeclarator (const cp_declarator *declarator,
tree late_return_type = declarator->u.function.late_return_type;
if (tree auto_node = type_uses_auto (type))
{
if (!late_return_type && funcdecl_p)
if (!late_return_type)
{
if (current_class_type
&& LAMBDA_TYPE_P (current_class_type))
if (!funcdecl_p)
/* auto (*fp)() = f; is OK. */;
else if (current_class_type
&& LAMBDA_TYPE_P (current_class_type))
/* OK for C++11 lambdas. */;
else if (cxx_dialect < cxx14)
{

13
gcc/testsuite/g++.dg/cpp0x/auto55.C Normal file
View file

@ -0,0 +1,13 @@
// PR c++/98441
// { dg-do compile { target c++11 } }
struct a {
int& mfn();
};
void fn()
{
int& (a::*myvar1)(void) = &a::mfn;
auto& (a::*myvar2)(void) = &a::mfn;
auto (a::*myvar3)(void) = &a::mfn;
}