From 8d7ff01933c18532c82c864bd9182db619fcab43 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 21 Aug 2023 09:01:00 +0200 Subject: tree-optimization/111070 - fix ICE with recent ifcombine fix We now got test coverage for non-SSA name bits so the following amends the SSA_NAME_OCCURS_IN_ABNORMAL_PHI checks. PR tree-optimization/111070 * tree-ssa-ifcombine.c (ifcombine_ifandif): Check we have an SSA name before checking SSA_NAME_OCCURS_IN_ABNORMAL_PHI. * gcc.dg/pr111070.c: New testcase. --- gcc/testsuite/gcc.dg/pr111070.c | 20 ++++++++++++++++++++ gcc/tree-ssa-ifcombine.c | 9 ++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr111070.c diff --git a/gcc/testsuite/gcc.dg/pr111070.c b/gcc/testsuite/gcc.dg/pr111070.c new file mode 100644 index 00000000000..1ebc7adf782 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr111070.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-O" } */ + +/* common */ +char c; +/* arrays must be 8 byte aligned, regardless of size */ +char c_ary[1]; + +/* data */ +char d = 1; +char d_ary[1] = {1}; + +int main () +{ + if (((unsigned long)&c_ary[0] & 7) != 0) + return 1; + if (((unsigned long)&d_ary[0] & 7) != 0) + return 1; + return 0; +} diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c index c366e872bcd..e22bed94f11 100644 --- a/gcc/tree-ssa-ifcombine.c +++ b/gcc/tree-ssa-ifcombine.c @@ -413,7 +413,8 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, { tree t, t2; - if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)) + if (TREE_CODE (name1) == SSA_NAME + && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)) return false; /* Do it. */ @@ -466,8 +467,10 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, gimple_stmt_iterator gsi; tree t; - if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1) - || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2)) + if ((TREE_CODE (name1) == SSA_NAME + && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)) + || (TREE_CODE (name2) == SSA_NAME + && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2))) return false; /* Find the common name which is bit-tested. */ -- cgit v1.2.3