revert: [multiple changes]

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

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

	Backport from mainline
	2015-05-26  Michael Matz  <matz@suse.de>

	PR middle-end/66251
	* tree-vect-stmts.c (vect_create_vectorized_demotion_stmts): Always set
	STMT_VINFO_VEC_STMT, also with SLP.

	2015-05-22  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/66251
	* tree-vect-stmts.c (vectorizable_conversion): Properly
	set STMT_VINFO_VEC_STMT even for the SLP case.

From-SVN: r224522

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37c61fe87bc8b2d4efefe134b473ca973e5e21af..0647343405e8568e4114cd90a2ce821062848a24 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,21 @@
+2015-06-16  Richard Biener  <rguenther@suse.de>
+
+       Revert
+       2015-06-01  Richard Biener  <rguenther@suse.de>
+
+       Backport from mainline
+       2015-05-26  Michael Matz  <matz@suse.de>
+
+       PR middle-end/66251
+       * tree-vect-stmts.c (vect_create_vectorized_demotion_stmts): Always set
+       STMT_VINFO_VEC_STMT, also with SLP.
+
+       2015-05-22  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/66251
+       * tree-vect-stmts.c (vectorizable_conversion): Properly
+       set STMT_VINFO_VEC_STMT even for the SLP case.
+
 2015-06-16  Christophe Lyon  <christophe.lyon@linaro.org>
 
        Backported from mainline r217076.

diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 798bcaf15cc54a004e03438775324643d406b365..075c5009fde7bf271d68322b19d4618b09e7c847 100644 (file)
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -3314,13 +3314,15 @@ vect_create_vectorized_demotion_stmts (vec<tree> *vec_oprnds,
             (or in STMT_VINFO_RELATED_STMT chain).  */
          if (slp_node)
            SLP_TREE_VEC_STMTS (slp_node).quick_push (new_stmt);
-
-         if (!*prev_stmt_info)
-           STMT_VINFO_VEC_STMT (stmt_info) = new_stmt;
          else
-           STMT_VINFO_RELATED_STMT (*prev_stmt_info) = new_stmt;
+           {
+             if (!*prev_stmt_info)
+               STMT_VINFO_VEC_STMT (stmt_info) = new_stmt;
+             else
+               STMT_VINFO_RELATED_STMT (*prev_stmt_info) = new_stmt;
 
-         *prev_stmt_info = vinfo_for_stmt (new_stmt);
+             *prev_stmt_info = vinfo_for_stmt (new_stmt);
+           }
        }
     }
 
@@ -3901,12 +3903,14 @@ vectorizable_conversion (gimple stmt, gimple_stmt_iterator *gsi,
 
              if (slp_node)
                SLP_TREE_VEC_STMTS (slp_node).quick_push (new_stmt);
-
-             if (!prev_stmt_info)
-               STMT_VINFO_VEC_STMT (stmt_info) = new_stmt;
              else
-               STMT_VINFO_RELATED_STMT (prev_stmt_info) = new_stmt;
-             prev_stmt_info = vinfo_for_stmt (new_stmt);
+               {
+                 if (!prev_stmt_info)
+                   STMT_VINFO_VEC_STMT (stmt_info) = new_stmt;
+                 else
+                   STMT_VINFO_RELATED_STMT (prev_stmt_info) = new_stmt;
+                 prev_stmt_info = vinfo_for_stmt (new_stmt);
+               }
            }
        }