diff options
| author | Richard Biener <rguenther@suse.de> | 2019-02-15 07:39:45 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-02-15 08:39:45 +0100 |
| commit | 4c9ed22ae08c2b621efd6c8a1600e47b67d66c66 (patch) | |
| tree | 3c0b3134250d40992538c3f58ee47fd7448734e7 | |
| parent | 5f88ba10e017ec213b0fc4e1b0cd63f3dfcb6660 (diff) | |
| download | gcc-4c9ed22ae08c2b621efd6c8a1600e47b67d66c66.zip gcc-4c9ed22ae08c2b621efd6c8a1600e47b67d66c66.tar.gz gcc-4c9ed22ae08c2b621efd6c8a1600e47b67d66c66.tar.bz2 | |
re PR tree-optimization/89278 (ICE in gimplify_modify_expr, at gimplify.c:5821)
PR tree-optimization/89278
* tree-loop-distribution.c: Include tree-eh.h.
(generate_memset_builtin, generate_memcpy_builtin): Call
rewrite_to_non_trapping_overflow on builtin->size before passing it
to force_gimple_operand_gsi.
* gcc.dg/pr89278.c: New test.
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
From-SVN: r268927
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr89278.c | 23 | ||||
| -rw-r--r-- | gcc/tree-loop-distribution.c | 5 |
4 files changed, 41 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6045ad0..a9b7ed2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2019-02-15 Richard Biener <rguenther@suse.de> + Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/89278 + * tree-loop-distribution.c: Include tree-eh.h. + (generate_memset_builtin, generate_memcpy_builtin): Call + rewrite_to_non_trapping_overflow on builtin->size before passing it + to force_gimple_operand_gsi. + 2019-02-15 Jakub Jelinek <jakub@redhat.com> PR other/89342 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 582d28d..6b5b422 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-02-15 Richard Biener <rguenther@suse.de> + Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/89278 + * gcc.dg/pr89278.c: New test. + 2019-02-15 Jakub Jelinek <jakub@redhat.com> PR c/89340 diff --git a/gcc/testsuite/gcc.dg/pr89278.c b/gcc/testsuite/gcc.dg/pr89278.c new file mode 100644 index 0000000..609cb1a --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr89278.c @@ -0,0 +1,23 @@ +/* PR tree-optimization/89278 */ +/* { dg-do compile } */ +/* { dg-options "-O1 -ftrapv -ftree-loop-distribute-patterns --param max-loop-header-insns=2" } */ + +void +foo (int *w, int x, int y, int z) +{ + while (x < y + z) + { + w[x] = 0; + ++x; + } +} + +void +bar (int *__restrict u, int *__restrict w, int x, int y, int z) +{ + while (x < y + z) + { + w[x] = u[x]; + ++x; + } +} diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c index 7df052d..066356f 100644 --- a/gcc/tree-loop-distribution.c +++ b/gcc/tree-loop-distribution.c @@ -114,6 +114,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-scalar-evolution.h" #include "params.h" #include "tree-vectorizer.h" +#include "tree-eh.h" #define MAX_DATAREFS_NUM \ @@ -996,7 +997,7 @@ generate_memset_builtin (struct loop *loop, partition *partition) /* The new statements will be placed before LOOP. */ gsi = gsi_last_bb (loop_preheader_edge (loop)->src); - nb_bytes = builtin->size; + 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; @@ -1048,7 +1049,7 @@ generate_memcpy_builtin (struct loop *loop, partition *partition) /* The new statements will be placed before LOOP. */ gsi = gsi_last_bb (loop_preheader_edge (loop)->src); - nb_bytes = builtin->size; + 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; |