From: Jason Merrill <jason@redhat.com>
To: Marek Polacek <polacek@redhat.com>,
GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] c++: Fix thinko in auto return type checking [PR98441]
Date: Thu, 7 Jan 2021 16:12:56 -0500 [thread overview]
Message-ID: <a77b8918-14d2-db9c-0cdb-cc1b0269c413@redhat.com> (raw)
In-Reply-To: <20210106003132.1304027-1-polacek@redhat.com>
On 1/5/21 7:31 PM, Marek Polacek wrote:
> 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.
>
> Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?
OK.
> 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.
> ---
> gcc/cp/decl.c | 8 +++++---
> gcc/testsuite/g++.dg/cpp0x/auto55.C | 13 +++++++++++++
> 2 files changed, 18 insertions(+), 3 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/cpp0x/auto55.C
>
> diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
> index bf6f12c26a0..1a114a2e2d0 100644
> --- a/gcc/cp/decl.c
> +++ b/gcc/cp/decl.c
> @@ -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)
> {
> diff --git a/gcc/testsuite/g++.dg/cpp0x/auto55.C b/gcc/testsuite/g++.dg/cpp0x/auto55.C
> new file mode 100644
> index 00000000000..5bd32ac890d
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/cpp0x/auto55.C
> @@ -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;
> +}
>
> base-commit: ad92bf4b165935b58195825dc8f089f53fd2710b
>
prev parent reply other threads:[~2021-01-07 21:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 0:31 Marek Polacek
2021-01-07 21:12 ` Jason Merrill [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a77b8918-14d2-db9c-0cdb-cc1b0269c413@redhat.com \
--to=jason@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=polacek@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).