re PR tree-optimization/66636 (ICE in vect_get_vec_def_for_stmt_copy, at tree-vect...

2015-06-23  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/66636
	* tree-vect-stmts.c (vectorizable_store): Properly compute the
	def type for further defs for strided stores.

	* gcc.dg/vect/pr66636.c: New testcase.

From-SVN: r224841

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7d60f5306070aeafac37a014ce677e8717619cb..bc1d0fd9ac8c75fb69bbe9b0d59150cf9adcdd0e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-23  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/66636
+       * tree-vect-stmts.c (vectorizable_store): Properly compute the
+       def type for further defs for strided stores.
+
 2015-06-23  Nathan Sidwell  <nathan@codesourcery.com>
 
        * config/nvptx/nvptx.md (sel_true<mode>, sel_false<mode>): New

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f305d812d468ae2c6144b1f5a93f58a0cb5974d9..65ad0c482c19e8a5e1e5dbb24d09178c1c50d5cf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-23  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/66636
+       * gcc.dg/vect/pr66636.c: New testcase.
+
 2015-06-23  Marek Polacek  <polacek@redhat.com>
 
        * gcc.dg/fold-minus-4.c: New test.

diff --git a/gcc/testsuite/gcc.dg/vect/pr66636.c b/gcc/testsuite/gcc.dg/vect/pr66636.c
new file mode 100644 (file)
index 0000000..7e6e5f6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/pr66636.c
@@ -0,0 +1,29 @@
+/* { dg-additional-options "-mavx2" { target avx_runtime } } */
+
+#include "tree-vect.h"
+
+extern void abort (void);
+
+struct X { double x; double y; };
+
+void foo (struct X *x, double px, int s)
+{
+  int i;
+  for (i = 0; i < 256; ++i)
+    {
+      x[i*s].x = px;
+      x[i*s].y = i + px;
+    }
+}
+
+int main()
+{
+  struct X x[512];
+  int i;
+  check_vect ();
+  foo (x, 1., 2);
+  if (x[0].x != 1. || x[0].y != 1.
+      || x[510].x != 1. || x[510].y != 256.)
+    abort ();
+  return 0;
+}

diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 0b9c8d6e1f96a417f90dbe28b8fb78a1cd01eebc..cac4768af0bbfb183c3e05c2cff5babfad5a9849 100644 (file)
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5365,7 +5365,11 @@ vectorizable_store (gimple stmt, gimple_stmt_iterator *gsi, gimple *vec_stmt,
                  if (slp)
                    vec_oprnd = vec_oprnds[j];
                  else
-                   vec_oprnd = vect_get_vec_def_for_stmt_copy (dt, vec_oprnd);
+                   {
+                     vect_is_simple_use (vec_oprnd, NULL, loop_vinfo,
+                                         bb_vinfo, &def_stmt, &def, &dt);
+                     vec_oprnd = vect_get_vec_def_for_stmt_copy (dt, vec_oprnd);
+                   }
                }
 
              for (i = 0; i < nstores; i++)