backport: re PR tree-optimization/91665 (ICE in build_vector_from_val, at tree.c...

	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: r277249

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f40e8efb6d134cdac8599f42495f950d6c5d137..c98ac09f6fa2f4a77a7bb4d9229c4de270cb5f2f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2019-10-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 1963746212e1752ad6c65be690720bae42dc5cec..c6a1ad795a18e7baf90680507850da3125b0dd6d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2019-10-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 (file)
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 337e078df002676463d5dea5aab040969680795f..0308b26b808eee18a1d4192326ea9cbce033bcc5 100644 (file)
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -6445,10 +6445,13 @@ vectorizable_reduction (stmt_vec_info stmt_info, 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)