diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2022-09-17 08:18:24 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2022-09-17 08:18:24 +0200 |
| commit | 9ac9fde961f76879f0379ff3b2494a2f9ac915f7 (patch) | |
| tree | 7acab99b000e17f41620f94f5b35156643a340fe /gcc | |
| parent | 7ee0fa100f0f28d7b88237d520131e07b7b49f0a (diff) | |
| download | gcc-9ac9fde961f76879f0379ff3b2494a2f9ac915f7.zip gcc-9ac9fde961f76879f0379ff3b2494a2f9ac915f7.tar.gz gcc-9ac9fde961f76879f0379ff3b2494a2f9ac915f7.tar.bz2 | |
reassoc: Fix up recent regression in optimize_range_tests_cmp_bitwise [PR106958]
As the following testcase reduced from glibc fmtmsg.c shows
(it doesn't ICE on x86_64/i686 unfortunately, but does on various other
arches), my last optimize_range_tests_cmp_bitwise change wasn't fully
correct. The intent was to let all pointer operands be cast to
pointer_sized_int_node first in addition to the other casts (to type1)
which are done for id >= l cases.
But one spot I've touched used always cast to type1 (note, the (b % 4) == 3
case is impossible for pointer operands because that is for !TYPE_UNSIGNED
operands and pointers are TYPE_UNSIGNED) and in the other spot the cast
would be done only for id >= l if not useless, but for pointers we need
to cast it always.
2022-09-17 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/106958
* tree-ssa-reassoc.cc (optimize_range_tests_cmp_bitwise): If
id >= l, cast op to type1, otherwise to pointer_sized_int_node.
If type has pointer type, cast exp to pointer_sized_int_node
even when id < l.
* gcc.c-torture/compile/pr106958.c: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr106958.c | 13 | ||||
| -rw-r--r-- | gcc/tree-ssa-reassoc.cc | 9 |
2 files changed, 19 insertions, 3 deletions
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr106958.c b/gcc/testsuite/gcc.c-torture/compile/pr106958.c new file mode 100644 index 0000000..98e6554 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr106958.c @@ -0,0 +1,13 @@ +/* PR tree-optimization/106958 */ + +int a; +void bar (int); + +void +foo (char *x, char *y) +{ + int b = a != 0; + int c = x != 0; + int d = y != 0; + bar (b | c | d); +} diff --git a/gcc/tree-ssa-reassoc.cc b/gcc/tree-ssa-reassoc.cc index f45e552..c5c8b68 100644 --- a/gcc/tree-ssa-reassoc.cc +++ b/gcc/tree-ssa-reassoc.cc @@ -3680,15 +3680,18 @@ optimize_range_tests_cmp_bitwise (enum tree_code opcode, int first, int length, if (id == l || POINTER_TYPE_P (TREE_TYPE (op))) { code = (b % 4) == 3 ? BIT_NOT_EXPR : NOP_EXPR; - g = gimple_build_assign (make_ssa_name (type1), code, op); + tree type3 = id >= l ? type1 : pointer_sized_int_node; + g = gimple_build_assign (make_ssa_name (type3), code, op); gimple_seq_add_stmt_without_update (&seq, g); op = gimple_assign_lhs (g); } tree type = TREE_TYPE (r->exp); tree exp = r->exp; - if (id >= l && !useless_type_conversion_p (type1, type)) + if (POINTER_TYPE_P (type) + || (id >= l && !useless_type_conversion_p (type1, type))) { - g = gimple_build_assign (make_ssa_name (type1), NOP_EXPR, exp); + tree type3 = id >= l ? type1 : pointer_sized_int_node; + g = gimple_build_assign (make_ssa_name (type3), NOP_EXPR, exp); gimple_seq_add_stmt_without_update (&seq, g); exp = gimple_assign_lhs (g); } |