diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-03-11 09:32:22 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-03-11 09:32:22 +0100 |
| commit | 05ac4d9c7b336e30413dd80c3630981151499f9e (patch) | |
| tree | c7e4f500496fa833ed72e691ea6bb0ea0e2636bf | |
| parent | 8f0d8cd852255f9767626b084fc7926cbbea166f (diff) | |
| download | gcc-05ac4d9c7b336e30413dd80c3630981151499f9e.zip gcc-05ac4d9c7b336e30413dd80c3630981151499f9e.tar.gz gcc-05ac4d9c7b336e30413dd80c3630981151499f9e.tar.bz2 | |
ldist: Further fixes for -ftrapv [PR94114]
As the testcase shows, arithmetics that for -ftrapv would need multiple
basic blocks can show up not just in nb_bytes expressions where we
are calling rewrite_to_non_trapping_overflow for a while already,
but also in the pointer expression to the start of the region.
While the testcase covers just the first hunk and I've failed to create
a testcase for the latter, it is at least in theory possible too, so I've
adjusted that hunk too.
2020-03-11 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/94114
* tree-loop-distribution.c (generate_memset_builtin): Call
rewrite_to_non_trapping_overflow even on mem.
(generate_memcpy_builtin): Call rewrite_to_non_trapping_overflow even
on dest and src.
* gcc.dg/pr94114.c: New test.
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr94114.c | 13 | ||||
| -rw-r--r-- | gcc/tree-loop-distribution.c | 6 |
4 files changed, 29 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 887a550..6630a20 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2020-03-11 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/94114 + * tree-loop-distribution.c (generate_memset_builtin): Call + rewrite_to_non_trapping_overflow even on mem. + (generate_memcpy_builtin): Call rewrite_to_non_trapping_overflow even + on dest and src. + 2020-03-10 Jeff Law <law@redhat.com> * config/bfin/bfin.md (movsi_insv): Add length attribute. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d243255..954c451 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-11 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/94114 + * gcc.dg/pr94114.c: New test. + 2020-03-10 Marek Polacek <polacek@redhat.com> PR c++/94124 - wrong conversion error with non-viable overload. diff --git a/gcc/testsuite/gcc.dg/pr94114.c b/gcc/testsuite/gcc.dg/pr94114.c new file mode 100644 index 0000000..8d6d0eb --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr94114.c @@ -0,0 +1,13 @@ +/* PR tree-optimization/94114 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -ftree-loop-distribute-patterns -ftrapv" } */ + +void +foo (int *x, int *y, int *z, long int w) +{ + while (y + w > z) + { + x[w] = 0; + --w; + } +} diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c index a4f0b1e..35d3821 100644 --- a/gcc/tree-loop-distribution.c +++ b/gcc/tree-loop-distribution.c @@ -1151,7 +1151,7 @@ generate_memset_builtin (class loop *loop, partition *partition) nb_bytes = rewrite_to_non_trapping_overflow (builtin->size); nb_bytes = force_gimple_operand_gsi (&gsi, nb_bytes, true, NULL_TREE, false, GSI_CONTINUE_LINKING); - mem = builtin->dst_base; + mem = rewrite_to_non_trapping_overflow (builtin->dst_base); mem = force_gimple_operand_gsi (&gsi, mem, true, NULL_TREE, false, GSI_CONTINUE_LINKING); @@ -1205,8 +1205,8 @@ generate_memcpy_builtin (class loop *loop, partition *partition) nb_bytes = rewrite_to_non_trapping_overflow (builtin->size); nb_bytes = force_gimple_operand_gsi (&gsi, nb_bytes, true, NULL_TREE, false, GSI_CONTINUE_LINKING); - dest = builtin->dst_base; - src = builtin->src_base; + dest = rewrite_to_non_trapping_overflow (builtin->dst_base); + src = rewrite_to_non_trapping_overflow (builtin->src_base); if (partition->kind == PKIND_MEMCPY || ! ptr_derefs_may_alias_p (dest, src)) kind = BUILT_IN_MEMCPY; |