From: Richard Biener <rguenther@suse.de>
Date: Tue, 16 Jun 2015 15:00:03 +0000 (+0000)
Subject: revert: [multiple changes]
X-Git-Tag: releases/gcc-4.8.5~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75e8be71472c5821d91a1b3f4030962b079cce56;p=thirdparty%2Fgcc.git

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 033e80c1ef43..263a8cec8b8a 100644
--- 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 53c286c95085..87a75cddef1d 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -2191,13 +2191,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);
+	    }
 	}
     }
 
@@ -2776,12 +2778,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);
+		}
 	    }
 	}