public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Patrick Palka <ppalka@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1698] c++: REF_PARENTHESIZED_P wrapper inhibiting NRVO [PR67302] Date: Mon, 21 Jun 2021 11:56:52 +0000 (GMT) [thread overview] Message-ID: <20210621115652.F01E73938C24@sourceware.org> (raw) https://gcc.gnu.org/g:21761d2b2b01f6cef4287c646845f6b3006546aa commit r12-1698-g21761d2b2b01f6cef4287c646845f6b3006546aa Author: Patrick Palka <ppalka@redhat.com> Date: Mon Jun 21 07:54:29 2021 -0400 c++: REF_PARENTHESIZED_P wrapper inhibiting NRVO [PR67302] Here, in C++14 or later, we remember the parentheses around 'a' in the return statement by using a REF_PARENTHESIZED_P wrapper, which ends up inhibiting NRVO because we don't look through this wrapper before checking the conditions for NRVO. This patch fixes this by calling maybe_undo_parenthesized_ref sooner in check_return_expr. PR c++/67302 gcc/cp/ChangeLog: * typeck.c (check_return_expr): Call maybe_undo_parenthesized_ref sooner, before the NRVO handling. gcc/testsuite/ChangeLog: * g++.dg/opt/nrv21.C: New test. Diff: --- gcc/cp/typeck.c | 9 ++++----- gcc/testsuite/g++.dg/opt/nrv21.C | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 5a9331b36e6..937581ae83c 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -10311,7 +10311,10 @@ check_return_expr (tree retval, bool *no_warning) See finish_function and finalize_nrv for the rest of this optimization. */ if (retval) - STRIP_ANY_LOCATION_WRAPPER (retval); + { + retval = maybe_undo_parenthesized_ref (retval); + STRIP_ANY_LOCATION_WRAPPER (retval); + } bool named_return_value_okay_p = can_do_nrvo_p (retval, functype); if (fn_returns_value_p && flag_elide_constructors) @@ -10345,10 +10348,6 @@ check_return_expr (tree retval, bool *no_warning) if (VOID_TYPE_P (functype)) return error_mark_node; - /* If we had an id-expression obfuscated by force_paren_expr, we need - to undo it so we can try to treat it as an rvalue below. */ - retval = maybe_undo_parenthesized_ref (retval); - if (processing_template_decl) retval = build_non_dependent_expr (retval); diff --git a/gcc/testsuite/g++.dg/opt/nrv21.C b/gcc/testsuite/g++.dg/opt/nrv21.C new file mode 100644 index 00000000000..ff338527456 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/nrv21.C @@ -0,0 +1,14 @@ +// PR c++/67302 +// { dg-additional-options -fdump-tree-gimple } +// { dg-final { scan-tree-dump-not "<retval> = a" "gimple" } } + +struct A +{ + int ar[42]; + A(); +}; + +A f() { + A a; + return (a); // The parens should not inhibit NRVO. +}
reply other threads:[~2021-06-21 11:56 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210621115652.F01E73938C24@sourceware.org \ --to=ppalka@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /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: linkBe 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).