diff options
author | Jakub Jelinek <jakub@redhat.com> | 2019-11-21 18:12:06 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-11-21 18:12:06 +0100 |
commit | 7da11884fe193328bb05ce1f39b8c5a5f45022c1 (patch) | |
tree | 596c0df8c66c54df172921f9e503edc5c4088aa2 /gcc | |
parent | 2ff2d92fa0e83d1ea27011efc0996136713f5c79 (diff) | |
download | gcc-7da11884fe193328bb05ce1f39b8c5a5f45022c1.zip gcc-7da11884fe193328bb05ce1f39b8c5a5f45022c1.tar.gz gcc-7da11884fe193328bb05ce1f39b8c5a5f45022c1.tar.bz2 |
backport: re PR tree-optimization/91665 (ICE in build_vector_from_val, at tree.c:1904)
Backported from mainline
2019-09-07 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/91665
* tree-vect-loop.c (vectorizable_reduction): Punt if base has type
incompatible with the type of PHI result.
* gcc.dg/vect/pr91665.c: New test.
From-SVN: r278576
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/vect/pr91665.c | 15 | ||||
-rw-r--r-- | gcc/tree-vect-loop.c | 5 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 98fb8cd..055fac6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,12 @@ 2019-11-21 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2019-09-07 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/91665 + * tree-vect-loop.c (vectorizable_reduction): Punt if base has type + incompatible with the type of PHI result. + 2019-09-06 Jakub Jelinek <jakub@redhat.com> * function.c (assign_parm_find_data_types): Use RECORD_OR_UNION_TYPE_P diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 489faf4..c10dd9a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2019-11-21 Jakub Jelinek <jakub@redhat.com> Backported from mainline + 2019-09-07 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/91665 + * gcc.dg/vect/pr91665.c: New test. + 2019-09-05 Jakub Jelinek <jakub@redhat.com> PR middle-end/91001 diff --git a/gcc/testsuite/gcc.dg/vect/pr91665.c b/gcc/testsuite/gcc.dg/vect/pr91665.c new file mode 100644 index 0000000..6b69ea0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr91665.c @@ -0,0 +1,15 @@ +/* PR tree-optimization/91665 */ +/* { dg-do compile } */ +/* { dg-additional-options "-Ofast" } */ + +short int v; + +void +foo (short int x, short int y) +{ + short int *p = &v; + + x = 1; + while (x != 0) + x += ++y || (*p = x); +} diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index e50dca91..ce87614 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -6808,10 +6808,13 @@ vectorizable_reduction (gimple *stmt, gimple_stmt_iterator *gsi, gcc_assert (TREE_CODE (base) == INTEGER_CST && TREE_CODE (step) == INTEGER_CST); cond_reduc_val = NULL_TREE; + tree res = PHI_RESULT (STMT_VINFO_STMT (cond_stmt_vinfo)); + if (!types_compatible_p (TREE_TYPE (res), TREE_TYPE (base))) + ; /* Find a suitable value, for MAX_EXPR below base, for MIN_EXPR above base; punt if base is the minimum value of the type for MAX_EXPR or maximum value of the type for MIN_EXPR for now. */ - if (tree_int_cst_sgn (step) == -1) + else if (tree_int_cst_sgn (step) == -1) { cond_reduc_op_code = MIN_EXPR; if (tree_int_cst_sgn (base) == -1) |