From: Alan Lawrence <alan.lawrence@arm.com>
Date: Tue, 1 Sep 2015 10:51:43 +0000 (+0000)
Subject: Tidy tree-ssa-dom.c: Use dom_valueize more.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b49d67bbdb381e38fc8dcdea1e5cf7e81034566;p=gcc.git

Tidy tree-ssa-dom.c: Use dom_valueize more.

	* tree-ssa-dom.c (record_equivalences_from_phis,
	record_equivalences_from_stmt, optimize_stmt): Use dom_valueize.
	(lookup_avail_expr): Likewise, and remove comment and unused temp.

From-SVN: r227366
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 110ceb5160e..c2181aefa62 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-31  Alan Lawrence  <alan.lawrence@arm.com>
+
+	* tree-ssa-dom.c (record_equivalences_from_phis,
+	record_equivalences_from_stmt, optimize_stmt): Use dom_valueize.
+	(lookup_avail_expr): Likewise, and remove comment and unused temp.
+
 2015-09-01  Nick Clifton  <nickc@redhat.com>
 
 	* config/msp430/msp430.opt (mcpu): Fix typo.
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 248b0371ebd..a26ae558b0e 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -1577,12 +1577,7 @@ record_equivalences_from_phis (basic_block bb)
 	  if (lhs == t)
 	    continue;
 
-	  /* Valueize t.  */
-	  if (TREE_CODE (t) == SSA_NAME)
-	    {
-	      tree tmp = SSA_NAME_VALUE (t);
-	      t = tmp ? tmp : t;
-	    }
+	  t = dom_valueize (t);
 
 	  /* If we have not processed an alternative yet, then set
 	     RHS to this alternative.  */
@@ -2160,12 +2155,7 @@ record_equivalences_from_stmt (gimple stmt, int may_optimize_p)
 	  && (TREE_CODE (rhs) == SSA_NAME
 	      || is_gimple_min_invariant (rhs)))
 	{
-	  /* Valueize rhs.  */
-	  if (TREE_CODE (rhs) == SSA_NAME)
-	    {
-	      tree tmp = SSA_NAME_VALUE (rhs);
-	      rhs = tmp ? tmp : rhs;
-	    }
+	  rhs = dom_valueize (rhs);
 
 	  if (dump_file && (dump_flags & TDF_DETAILS))
 	    {
@@ -2442,12 +2432,7 @@ optimize_stmt (basic_block bb, gimple_stmt_iterator si)
 	  tree rhs = gimple_assign_rhs1 (stmt);
 	  tree cached_lhs;
 	  gassign *new_stmt;
-	  if (TREE_CODE (rhs) == SSA_NAME)
-	    {
-	      tree tem = SSA_NAME_VALUE (rhs);
-	      if (tem)
-		rhs = tem;
-	    }
+	  rhs = dom_valueize (rhs);
 	  /* Build a new statement with the RHS and LHS exchanged.  */
 	  if (TREE_CODE (rhs) == SSA_NAME)
 	    {
@@ -2569,7 +2554,6 @@ lookup_avail_expr (gimple stmt, bool insert)
 {
   expr_hash_elt **slot;
   tree lhs;
-  tree temp;
   struct expr_hash_elt element;
 
   /* Get LHS of phi, assignment, or call; else NULL_TREE.  */
@@ -2664,14 +2648,7 @@ lookup_avail_expr (gimple stmt, bool insert)
      definition of another variable.  */
   lhs = (*slot)->lhs;
 
-  /* See if the LHS appears in the CONST_AND_COPIES table.  If it does, then
-     use the value from the const_and_copies table.  */
-  if (TREE_CODE (lhs) == SSA_NAME)
-    {
-      temp = SSA_NAME_VALUE (lhs);
-      if (temp)
-	lhs = temp;
-    }
+  lhs = dom_valueize (lhs);
 
   if (dump_file && (dump_flags & TDF_DETAILS))
     {