backport: re PR tree-optimization/61917 (ICE on valid code at -O3 on x86_64-linux...

2015-02-25  Richard Biener  <rguenther@suse.de>
	Kai Tietz  <ktietz@redhat.com>

	Backport from mainline
	PR tree-optimization/61917
	* tree-vect-loop.c (vectorizable_reduction): Allow
	vect_internal_def without reduction to exit graceful.

ChangeLog testsuite/

2015-02-25  Kai Tietz  <ktietz@redhat.com>

	Backport from mainline
	PR tree-optimization/61917
	* gcc.dg/vect/vect-pr61917.c: New file.

From-SVN: r220968

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b069a75b94159cc9301c8209c602bc31a6dcebf..001d1e952ffd144116c9498939858631672710c4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-25  Richard Biener  <rguenther@suse.de>
+       Kai Tietz  <ktietz@redhat.com>
+
+       Backported from mainline
+       PR tree-optimization/61917
+       * tree-vect-loop.c (vectorizable_reduction): Allow
+       vect_internal_def without reduction to exit graceful.
+
 2015-02-25  Georg-Johann Lay  <avr@gjlay.de>
 
        PR target/65196

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d3bd0f0b38a4158e51eed5ffea4b4b9766ecafcb..c86c2a33d650f95564ceff6c3d227e3bf75f3674 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-25  Kai Tietz  <ktietz@redhat.com>
+
+       Backported from mainline
+       PR tree-optimization/61917
+       * gcc.dg/vect/vect-pr61917.c: New file.
+
 2015-02-23  Oleg Endo  <olegendo@gcc.gnu.org>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.dg/vect/vect-pr61917.c b/gcc/testsuite/gcc.dg/vect/vect-pr61917.c
new file mode 100644 (file)
index 0000000..c55c620
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/vect-pr61917.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-O3" } */
+
+int a, b, c, d;
+
+int
+fn1 ()
+{
+  for (; c; c++)
+    for (b = 0; b < 2; b++)
+      d = a - d;
+  return d; 
+}

diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index bb8a9841d632e3298407e7c2686e8449a8ce6621..790914bcff676fc1efe407795e91c792573427aa 100644 (file)
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -4909,6 +4909,12 @@ vectorizable_reduction (gimple stmt, gimple_stmt_iterator *gsi,
   if (!vectype_in)
     vectype_in = tem;
   gcc_assert (is_simple_use);
+  if (!found_nested_cycle_def)
+    reduc_def_stmt = def_stmt;
+
+  if (gimple_code (reduc_def_stmt) != GIMPLE_PHI)
+    return false;
+
   if (!(dt == vect_reduction_def
        || dt == vect_nested_cycle
        || ((dt == vect_internal_def || dt == vect_external_def
@@ -4921,10 +4927,7 @@ vectorizable_reduction (gimple stmt, gimple_stmt_iterator *gsi,
       gcc_assert (orig_stmt);
       return false;
     }
-  if (!found_nested_cycle_def)
-    reduc_def_stmt = def_stmt;
 
-  gcc_assert (gimple_code (reduc_def_stmt) == GIMPLE_PHI);
   if (orig_stmt)
     gcc_assert (orig_stmt == vect_is_simple_reduction (loop_vinfo,
                                                        reduc_def_stmt,