diff options
author | Richard Biener <rguenther@suse.de> | 2023-08-21 09:01:00 +0200 |
---|---|---|
committer | Richard Biener <rguenther@suse.de> | 2024-06-11 09:12:35 +0200 |
commit | d73137ab352d654f50b703925bd92e021dce1cab (patch) | |
tree | 3addf55a7f5a3a2cfb0b462b5ecc5cd76eeea8fa | |
parent | cc835f41ec6ffd6a2a2128d3cf5c1f5c0e28e36e (diff) | |
download | gcc-d73137ab352d654f50b703925bd92e021dce1cab.zip gcc-d73137ab352d654f50b703925bd92e021dce1cab.tar.gz gcc-d73137ab352d654f50b703925bd92e021dce1cab.tar.bz2 |
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.cc (ifcombine_ifandif): Check we have
an SSA name before checking SSA_NAME_OCCURS_IN_ABNORMAL_PHI.
* gcc.dg/pr111070.c: New testcase.
(cherry picked from commit 966b0a96523fb7adbf498ac71df5e033c70dc546)
-rw-r--r-- | gcc/testsuite/gcc.dg/pr111070.c | 20 | ||||
-rw-r--r-- | gcc/tree-ssa-ifcombine.cc | 9 |
2 files changed, 26 insertions, 3 deletions
diff --git a/gcc/testsuite/gcc.dg/pr111070.c b/gcc/testsuite/gcc.dg/pr111070.c new file mode 100644 index 0000000..1ebc7ad --- /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.cc b/gcc/tree-ssa-ifcombine.cc index b139328..dcfa92c 100644 --- a/gcc/tree-ssa-ifcombine.cc +++ b/gcc/tree-ssa-ifcombine.cc @@ -415,7 +415,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. */ @@ -468,8 +469,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. */ |