diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2022-06-01 14:00:49 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2022-06-01 14:00:49 +0200 |
| commit | 0d5cc976a36af07c9790c38a99a0b98110c89795 (patch) | |
| tree | 7564d5ff9124d49fed52f08a1d2dc70c77070d62 /gcc | |
| parent | 45c8523dd3e50daa5f0bba040099fdfd2ad1aaaa (diff) | |
| download | gcc-0d5cc976a36af07c9790c38a99a0b98110c89795.zip gcc-0d5cc976a36af07c9790c38a99a0b98110c89795.tar.gz gcc-0d5cc976a36af07c9790c38a99a0b98110c89795.tar.bz2 | |
unswitch: Fold case label lo/hi values to index type [PR105770]
The following testcase ICEs because we use different types in comparison,
idx has int type, while CASE_LOW has char type.
While I believe all CASE_{LOW,HIGH} in the same switch have to use the same
or compatible type, the index expression can have a promoted type as happens
in this testcase. Other spots that handle switches do such foldings too.
2022-06-01 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/105770
* tree-ssa-loop-unswitch.cc (find_unswitching_predicates_for_bb): Cast
CASE_LOW and CASE_HIGH to TREE_TYPE (idx) before comparisons with idx.
* gcc.dg/pr105770.c: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr105770.c | 19 | ||||
| -rw-r--r-- | gcc/tree-ssa-loop-unswitch.cc | 9 |
2 files changed, 25 insertions, 3 deletions
diff --git a/gcc/testsuite/gcc.dg/pr105770.c b/gcc/testsuite/gcc.dg/pr105770.c new file mode 100644 index 0000000..c1e0140 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr105770.c @@ -0,0 +1,19 @@ +/* PR tree-optimization/105770 */ +/* { dg-do compile } */ +/* { dg-options "-O1 -funswitch-loops -fno-tree-forwprop" } */ + +char a; + +void +foo (void) +{ + while (a) + switch (a) + { + case ' ': + case '\t': + return; + } + + __builtin_unreachable (); +} diff --git a/gcc/tree-ssa-loop-unswitch.cc b/gcc/tree-ssa-loop-unswitch.cc index ad1d05c..2b6013e 100644 --- a/gcc/tree-ssa-loop-unswitch.cc +++ b/gcc/tree-ssa-loop-unswitch.cc @@ -494,6 +494,7 @@ find_unswitching_predicates_for_bb (basic_block bb, class loop *loop, { unsigned nlabels = gimple_switch_num_labels (stmt); tree idx = gimple_switch_index (stmt); + tree idx_type = TREE_TYPE (idx); if (!gimple_range_ssa_p (idx) || nlabels < 1) return; /* Index must be invariant. */ @@ -525,16 +526,18 @@ find_unswitching_predicates_for_bb (basic_block bb, class loop *loop, if (CASE_HIGH (lab) != NULL_TREE) { tree cmp1 = fold_build2 (GE_EXPR, boolean_type_node, idx, - CASE_LOW (lab)); + fold_convert (idx_type, + CASE_LOW (lab))); tree cmp2 = fold_build2 (LE_EXPR, boolean_type_node, idx, - CASE_HIGH (lab)); + fold_convert (idx_type, + CASE_HIGH (lab))); cmp = fold_build2 (BIT_AND_EXPR, boolean_type_node, cmp1, cmp2); lab_range.set (CASE_LOW (lab), CASE_HIGH (lab)); } else { cmp = fold_build2 (EQ_EXPR, boolean_type_node, idx, - CASE_LOW (lab)); + fold_convert (idx_type, CASE_LOW (lab))); lab_range.set (CASE_LOW (lab)); } |