From: Richard Guenther <rguenther@suse.de>
Date: Fri, 20 Apr 2012 10:17:46 +0000 (+0000)
Subject: re PR c++/53050 (ssa_forward_propagate_and_combine: segmentation fault)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4cbc836ed7d6a17696e1bebfeca37582b199ce41;p=gcc.git

re PR c++/53050 (ssa_forward_propagate_and_combine: segmentation fault)

2012-04-20  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/53050
	* tree-ssa-forwprop.c (ssa_forward_propagate_and_combine):
	Do only one transform on COND_EXPRs at the same time.

From-SVN: r186620
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c8825d59cd..f1d9799aa30 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-20  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/53050
+	* tree-ssa-forwprop.c (ssa_forward_propagate_and_combine):
+	Do only one transform on COND_EXPRs at the same time.
+
 2012-04-19  Jan Hubicka  <jh@suse.cz>
 
 	* symtab.c (dump_symtab_base): Revert accidental checkin.
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 3e2371bc83c..965f44150e6 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -2536,9 +2536,12 @@ ssa_forward_propagate_and_combine (void)
 			 || code == VEC_COND_EXPR)
 		  {
 		    /* In this case the entire COND_EXPR is in rhs1. */
-		    changed |= forward_propagate_into_cond (&gsi);
-		    changed |= combine_cond_exprs (&gsi);
-		    stmt = gsi_stmt (gsi);
+		    if (forward_propagate_into_cond (&gsi)
+			|| combine_cond_exprs (&gsi))
+		      {
+			changed = true;
+			stmt = gsi_stmt (gsi);
+		      }
 		  }
 		else if (TREE_CODE_CLASS (code) == tcc_comparison)
 		  {