public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-160] Do not fold ADDR_EXPR conditions leading to builtin_unreachable early.
@ 2023-04-21 20:34 Andrew Macleod
  0 siblings, 0 replies; only message in thread
From: Andrew Macleod @ 2023-04-21 20:34 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:f828503eeb79ad1f1ada6db7deccc5abcc2f3ca3

commit r14-160-gf828503eeb79ad1f1ada6db7deccc5abcc2f3ca3
Author: Andrew MacLeod <amacleod@redhat.com>
Date:   Fri Apr 21 15:03:43 2023 -0400

    Do not fold ADDR_EXPR conditions leading to builtin_unreachable early.
    
    Ranges can not represent &var globally yet, so we cannot fold these
    expressions early or we lose the __builtin_unreachable information.
    
            PR tree-optimization/109546
            gcc/
            * tree-vrp.cc (remove_unreachable::remove_and_update_globals): Do
            not fold conditions with ADDR_EXPR early.
    
            gcc/testsuite/
            * gcc.dg/pr109546.c: New.

Diff:
---
 gcc/testsuite/gcc.dg/pr109546.c | 24 ++++++++++++++++++++++++
 gcc/tree-vrp.cc                 |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/gcc.dg/pr109546.c b/gcc/testsuite/gcc.dg/pr109546.c
new file mode 100644
index 00000000000..ba8af0f31fa
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr109546.c
@@ -0,0 +1,24 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fdump-tree-optimized" } */
+
+void foo(void);
+static int a, c;
+static int *b = &a;
+static int **d = &b;
+void assert_fail() __attribute__((__noreturn__));
+int main() {
+  int *e = *d;
+  if (e == &a || e == &c);
+  else {
+    __builtin_unreachable();
+  assert_fail();
+  }
+  if (e == &a || e == &c);
+  else
+    foo();
+}
+
+/* { dg-final { scan-tree-dump-not "assert_fail" "optimized" } } */
+/* { dg-final { scan-tree-dump-not "foo" "optimized" } } */
+
+
diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc
index f4d484526c7..9b870640e23 100644
--- a/gcc/tree-vrp.cc
+++ b/gcc/tree-vrp.cc
@@ -150,7 +150,9 @@ remove_unreachable::remove_and_update_globals (bool final_p)
       // If this is already a constant condition, don't look either
       if (!lhs_p && !rhs_p)
 	continue;
-
+      // Do not remove addresses early. ie if (x == &y)
+      if (!final_p && lhs_p && TREE_CODE (gimple_cond_rhs (s)) == ADDR_EXPR)
+	continue;
       bool dominate_exit_p = true;
       FOR_EACH_GORI_EXPORT_NAME (m_ranger.gori (), e->src, name)
 	{

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-04-21 20:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-21 20:34 [gcc r14-160] Do not fold ADDR_EXPR conditions leading to builtin_unreachable early Andrew Macleod

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).