diff options
| author | Richard Biener <rguenther@suse.de> | 2023-08-21 09:01:00 +0200 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2023-08-21 10:07:30 +0200 |
| commit | 966b0a96523fb7adbf498ac71df5e033c70dc546 (patch) | |
| tree | fd99b443feb242b5ae63046802565cdc0c0ce36f /gcc | |
| parent | 47b833a9abe19d862a773d20dd6f961dcf811a11 (diff) | |
| download | gcc-966b0a96523fb7adbf498ac71df5e033c70dc546.zip gcc-966b0a96523fb7adbf498ac71df5e033c70dc546.tar.gz gcc-966b0a96523fb7adbf498ac71df5e033c70dc546.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.
Diffstat (limited to 'gcc')
| -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 d5701e8..46b0768 100644 --- a/gcc/tree-ssa-ifcombine.cc +++ b/gcc/tree-ssa-ifcombine.cc @@ -430,7 +430,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. */ @@ -489,8 +490,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. */ |