From: Patrick Palka <ppalka@redhat.com>
To: Simon Martin <simon@nasilyan.com>
Cc: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] c++: Relax too strict assert in stabilize_expr [PR111160]
Date: Fri, 28 Jun 2024 18:07:09 -0400 (EDT) [thread overview]
Message-ID: <868da70a-5fa3-dce1-4cdb-1459252e5d44@idea> (raw)
In-Reply-To: <0102019055ec2368-f8b335ab-baf4-421a-8748-f131254376c3-000000@eu-west-1.amazonses.com>
On Wed, 26 Jun 2024, Simon Martin wrote:
> The case in the ticket is an ICE on invalid due to an assert in stabilize_expr,
> but the underlying issue can actually trigger on this *valid* code:
>
> === cut here ===
> struct TheClass {
> TheClass() {}
> TheClass(volatile TheClass& t) {}
> TheClass operator=(volatile TheClass& t) volatile { return t; }
> };
> void the_func() {
> volatile TheClass x, y, z;
> (false ? x : y) = z;
> }
> === cut here ===
>
> The problem is that stabilize_expr asserts that it returns an expression
> without TREE_SIDE_EFFECTS, which can't be if the involved type is volatile.
>
> This patch relaxes the assert to accept having TREE_THIS_VOLATILE on the
> returned expression.
>
> Successfully tested on x86_64-pc-linux-gnu.
>
> PR c++/111160
>
> gcc/cp/ChangeLog:
>
> * tree.cc (stabilize_expr): Stabilized expressions can have
> TREE_SIDE_EFFECTS if they're volatile.
LGTM (although I can't formally approve the patch)
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/overload/error8.C: New test.
> * g++.dg/overload/volatile2.C: New test.
>
> ---
> gcc/cp/tree.cc | 2 +-
> gcc/testsuite/g++.dg/overload/error8.C | 9 +++++++++
> gcc/testsuite/g++.dg/overload/volatile2.C | 12 ++++++++++++
> 3 files changed, 22 insertions(+), 1 deletion(-)
> create mode 100644 gcc/testsuite/g++.dg/overload/error8.C
> create mode 100644 gcc/testsuite/g++.dg/overload/volatile2.C
>
> diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc
> index 28648c14c6d..dfd4a3a948b 100644
> --- a/gcc/cp/tree.cc
> +++ b/gcc/cp/tree.cc
> @@ -5969,7 +5969,7 @@ stabilize_expr (tree exp, tree* initp)
> }
> *initp = init_expr;
>
> - gcc_assert (!TREE_SIDE_EFFECTS (exp));
> + gcc_assert (!TREE_SIDE_EFFECTS (exp) || TREE_THIS_VOLATILE (exp));
> return exp;
> }
>
> diff --git a/gcc/testsuite/g++.dg/overload/error8.C b/gcc/testsuite/g++.dg/overload/error8.C
> new file mode 100644
> index 00000000000..a7e745860e0
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/overload/error8.C
> @@ -0,0 +1,9 @@
> +// PR c++/111160
> +// { dg-do compile { target c++11 } }
> +
> +class TheClass {}; // { dg-error "discards|bind|discards|bind" }
> +void the_func() {
> + TheClass x;
> + volatile TheClass y;
> + (false ? x : x) = y; // { dg-error "ambiguous|ambiguous" }
> +}
> diff --git a/gcc/testsuite/g++.dg/overload/volatile2.C b/gcc/testsuite/g++.dg/overload/volatile2.C
> new file mode 100644
> index 00000000000..9f27357aed6
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/overload/volatile2.C
> @@ -0,0 +1,12 @@
> +// PR c++/111160
> +// { dg-do compile { target c++11 } }
> +
> +struct TheClass {
> + TheClass() {}
> + TheClass(volatile TheClass& t) {}
> + TheClass operator=(volatile TheClass& t) volatile { return t; }
> +};
> +void the_func() {
> + volatile TheClass x, y, z;
> + (false ? x : y) = z;
> +}
> --
> 2.44.0
>
>
>
>
next prev parent reply other threads:[~2024-06-28 22:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240626190054.57209-1-simon@nasilyan.com>
2024-06-26 19:00 ` Simon Martin
2024-06-28 22:07 ` Patrick Palka [this message]
2024-07-01 18:27 ` Jason Merrill
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=868da70a-5fa3-dce1-4cdb-1459252e5d44@idea \
--to=ppalka@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=simon@nasilyan.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).