From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from a51-218.smtp-out.eu-west-1.amazonses.com (a51-218.smtp-out.eu-west-1.amazonses.com [54.240.51.218]) by sourceware.org (Postfix) with ESMTPS id 161413871016 for ; Wed, 26 Jun 2024 19:00:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 161413871016 Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=nasilyan.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eu-west-1.amazonses.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 161413871016 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=54.240.51.218 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719428460; cv=none; b=nprwBS2WojypsLKXji9K8hVUQJSsF0Abk+YzM+NOS5uAQKcB+hehxs7N56ocNIPVxbM+RwE24zfBhL4teA9jF/mzwMIeGsW3Nvg5PVXeOOdIIKWb9oOhltzS9De7B1WVs9QnuDbTg3JWZ90VqCMtxcNK6TrRKhuW4lQBV/JFDsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719428460; c=relaxed/simple; bh=IrekTm44Ne12pEdTQ7g4YAQG2lyVFQlrnib1usiRKuw=; h=DKIM-Signature:DKIM-Signature:Subject:From:To:Date:Mime-Version: Message-ID; b=VyMkQxpGcss7gTKlMv83AfAKx29a3d2YfNEmb3WUlSTDt2HWn3X/+qWSUUN0K5UvmuYrA5kCcH6ZRuyFZjBwxM79yWUIRoMjJV+7GQX1FGEVY+mNwREdEXG8dKI+bAn/xdIdoT4x5xv49HA/xoCLxj4hw8kb3A9JofR+vIzRJ3U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=xce2voaxvxhmx73p47whqmbxwwvd7qkl; d=nasilyan.com; t=1719428457; h=Subject:From:To:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=IrekTm44Ne12pEdTQ7g4YAQG2lyVFQlrnib1usiRKuw=; b=PAAfDY7OOJ32I5zpn3e/5SKJ4Angq3l/N8pWy/26Vtj77xja2JsiNpujUDjWhN/q S9Rw4jfCuQkpvGttS+wvzrG3bL9knUqXAW3IrNLkt1oxJYWL/HifB8DfGcPtpCNlurI PB7pZTMG2vAmBO1vyvFCfPe1EQC+hsSbhj9hXxXo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1719428457; h=Subject:From:To:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=IrekTm44Ne12pEdTQ7g4YAQG2lyVFQlrnib1usiRKuw=; b=BxB6HaVx1iE8TDa86jAPCE4Cq/F6ouKd/SP3VcPeFs2eJgbGjWJS68EMf3Vr8KJ5 noSE2fYN/KEM0kx9YpXuysLVKAZSe7yMP4+bPf0YeBUQdbK+qCpU/n4hX0GiSNCRp/P 26RToFNSafGtRJkXRKVURfHqjE0s6jqHRNaSqCKg= Subject: [PATCH] c++: Relax too strict assert in stabilize_expr [PR111160] From: =?UTF-8?Q?Simon_Martin?= To: =?UTF-8?Q?gcc-patches=40gcc=2Egnu=2Eorg?= Date: Wed, 26 Jun 2024 19:00:57 +0000 Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable References: <20240626190054.57209-1-simon@nasilyan.com> X-Mailer: Amazon WorkMail Thread-Index: AQHax/sssD4HNKomQ36MYEqUvep7aA== Thread-Topic: [PATCH] c++: Relax too strict assert in stabilize_expr [PR111160] X-Original-Mailer: git-send-email 2.44.0 X-Wm-Sent-Timestamp: 1719428456 Message-ID: <0102019055ec2368-f8b335ab-baf4-421a-8748-f131254376c3-000000@eu-west-1.amazonses.com> Feedback-ID: ::1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2024.06.26-54.240.51.218 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The case in the ticket is an ICE on invalid due to an assert in stabilize= _expr,=0D=0Abut the underlying issue can actually trigger on this *valid*= code:=0D=0A=0D=0A=3D=3D=3D cut here =3D=3D=3D=0D=0Astruct TheClass {=0D=0A= TheClass() {}=0D=0A TheClass(volatile TheClass& t) {}=0D=0A TheClass = operator=3D(volatile TheClass& t) volatile { return t; }=0D=0A};=0D=0Avoi= d the_func() {=0D=0A volatile TheClass x, y, z;=0D=0A (false =3F x : y)= =3D z;=0D=0A}=0D=0A=3D=3D=3D cut here =3D=3D=3D=0D=0A=0D=0AThe problem i= s that stabilize_expr asserts that it returns an expression=0D=0Awithout = TREE_SIDE_EFFECTS, which can't be if the involved type is volatile.=0D=0A= =0D=0AThis patch relaxes the assert to accept having TREE_THIS_VOLATILE o= n the=0D=0Areturned expression.=0D=0A=0D=0ASuccessfully tested on x86_64-= pc-linux-gnu.=0D=0A=0D=0A=09PR c++/111160=0D=0A=0D=0Agcc/cp/ChangeLog:=0D= =0A=0D=0A=09* tree.cc (stabilize_expr): Stabilized expressions can have=0D= =0A=09TREE_SIDE_EFFECTS if they're volatile.=0D=0A=0D=0Agcc/testsuite/Cha= ngeLog:=0D=0A=0D=0A=09* g++.dg/overload/error8.C: New test.=0D=0A=09* g++= =2Edg/overload/volatile2.C: New test.=0D=0A=0D=0A---=0D=0A gcc/cp/tree.cc= | 2 +-=0D=0A gcc/testsuite/g++.dg/overload/e= rror8.C | 9 +++++++++=0D=0A gcc/testsuite/g++.dg/overload/volatile2.C= | 12 ++++++++++++=0D=0A 3 files changed, 22 insertions(+), 1 deletion(-)= =0D=0A create mode 100644 gcc/testsuite/g++.dg/overload/error8.C=0D=0A cr= eate mode 100644 gcc/testsuite/g++.dg/overload/volatile2.C=0D=0A=0D=0Adif= f --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc=0D=0Aindex 28648c14c6d..dfd4a3a= 948b 100644=0D=0A--- a/gcc/cp/tree.cc=0D=0A+++ b/gcc/cp/tree.cc=0D=0A@@ -= 5969,7 +5969,7 @@ stabilize_expr (tree exp, tree* initp)=0D=0A }=0D=0A= *initp =3D init_expr;=0D=0A=20=0D=0A- gcc_assert (!TREE_SIDE_EFFECTS = (exp));=0D=0A+ gcc_assert (!TREE_SIDE_EFFECTS (exp) || TREE_THIS_VOLATIL= E (exp));=0D=0A return exp;=0D=0A }=0D=0A=20=0D=0Adiff --git a/gcc/test= suite/g++.dg/overload/error8.C b/gcc/testsuite/g++.dg/overload/error8.C=0D= =0Anew file mode 100644=0D=0Aindex 00000000000..a7e745860e0=0D=0A--- /dev= /null=0D=0A+++ b/gcc/testsuite/g++.dg/overload/error8.C=0D=0A@@ -0,0 +1,9= @@=0D=0A+// PR c++/111160=0D=0A+// { dg-do compile { target c++11 } }=0D= =0A+=0D=0A+class TheClass {}; // { dg-error "discards|bind|discards|bind"= }=0D=0A+void the_func() {=0D=0A+ TheClass x;=0D=0A+ volatile TheClass = y;=0D=0A+ (false =3F x : x) =3D y; // { dg-error "ambiguous|ambiguous" }= =0D=0A+}=0D=0Adiff --git a/gcc/testsuite/g++.dg/overload/volatile2.C b/gc= c/testsuite/g++.dg/overload/volatile2.C=0D=0Anew file mode 100644=0D=0Ain= dex 00000000000..9f27357aed6=0D=0A--- /dev/null=0D=0A+++ b/gcc/testsuite/= g++.dg/overload/volatile2.C=0D=0A@@ -0,0 +1,12 @@=0D=0A+// PR c++/111160=0D= =0A+// { dg-do compile { target c++11 } }=0D=0A+=0D=0A+struct TheClass {=0D= =0A+ TheClass() {}=0D=0A+ TheClass(volatile TheClass& t) {}=0D=0A+ The= Class operator=3D(volatile TheClass& t) volatile { return t; }=0D=0A+};=0D= =0A+void the_func() {=0D=0A+ volatile TheClass x, y, z;=0D=0A+ (false =3F= x : y) =3D z;=0D=0A+}=0D=0A--=20=0D=0A2.44.0=0D=0A=0D=0A