From: Jeff Law <law@redhat.com>
Date: Fri, 13 Sep 2013 06:04:32 +0000 (-0600)
Subject: Revert "        * tree-ssa-dom.c (cprop_into_successor_phis): Also propagate"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=823b5d6bbc2a7495618f3e42a223be6500d27ca4;p=gcc.git

Revert "        * tree-ssa-dom.c (cprop_into_successor_phis): Also propagate"

This reverts commit 592dc887e7bd7b2637b9277c3bd28f41a9487b17.

Conflicts:
	gcc/ChangeLog

From-SVN: r202553
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 57c94176144..f4790152135 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-10  Jeff Law  <law@redhat.com>
+
+	PR middle-end/58387
+	Revert:
+	2013-09-06  Jeff Law  <law@redhat.com>
+
+	* tree-ssa-dom.c (cprop_into_successor_phis): Also propagate
+	edge implied equivalences into successor phis.
+
 2013-09-12  DJ Delorie  <dj@redhat.com>
 
 	* config/rl78/rl78-virt.md: Change from | to \; for asm line
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index bf75135f75f..e02a56662b9 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -1642,28 +1642,6 @@ cprop_into_successor_phis (basic_block bb)
       if (gsi_end_p (gsi))
 	continue;
 
-      /* We may have an equivalence associated with this edge.  While
-	 we can not propagate it into non-dominated blocks, we can
-	 propagate them into PHIs in non-dominated blocks.  */
-
-      /* Push the unwind marker so we can reset the const and copies
-	 table back to its original state after processing this edge.  */
-      const_and_copies_stack.safe_push (NULL_TREE);
-
-      /* Extract and record any simple NAME = VALUE equivalences. 
-
-	 Don't bother with [01] = COND equivalences, they're not useful
-	 here.  */
-      struct edge_info *edge_info = (struct edge_info *) e->aux;
-      if (edge_info)
-	{
-	  tree lhs = edge_info->lhs;
-	  tree rhs = edge_info->rhs;
-
-	  if (lhs && TREE_CODE (lhs) == SSA_NAME)
-	    record_const_or_copy (lhs, rhs);
-	}
-
       indx = e->dest_idx;
       for ( ; !gsi_end_p (gsi); gsi_next (&gsi))
 	{
@@ -1689,8 +1667,6 @@ cprop_into_successor_phis (basic_block bb)
 	      && may_propagate_copy (orig_val, new_val))
 	    propagate_value (orig_p, new_val);
 	}
-
-      restore_vars_to_original_value ();
     }
 }