From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1011) id 23E3A3858D20; Fri, 21 Apr 2023 20:34:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23E3A3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682109277; bh=MaErd+Dtluh+UTEehHZPS6M53Ym37TJ8uY7rhkc9J4U=; h=From:To:Subject:Date:From; b=x8KsFywUVjS0ehtKjJvvF8gUjFavKRDZi1X0Th3BpJPPOtx0oN6dIuWrrdxqbt5n9 poxUHtm2N1NHg3Rm3l3v6TlaGe2ty6SDzw6loaVO35KR9+QPNBVf+X5mU2uD3gdJq/ 9ZYtFl2Nr2eZeGtqnF/LS+L9UmuMvrhit1IgRJpQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Macleod To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-160] Do not fold ADDR_EXPR conditions leading to builtin_unreachable early. X-Act-Checkin: gcc X-Git-Author: Andrew MacLeod X-Git-Refname: refs/heads/master X-Git-Oldrev: 03cebd304955a6b9c5607e09312d77f1307cc98e X-Git-Newrev: f828503eeb79ad1f1ada6db7deccc5abcc2f3ca3 Message-Id: <20230421203437.23E3A3858D20@sourceware.org> Date: Fri, 21 Apr 2023 20:34:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:f828503eeb79ad1f1ada6db7deccc5abcc2f3ca3 commit r14-160-gf828503eeb79ad1f1ada6db7deccc5abcc2f3ca3 Author: Andrew MacLeod 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) {