tree-ssa-uncprop.c (associate_equivalences_with_edges): Avoid entering the…

tree-ssa-uncprop.c (associate_equivalences_with_edges): Avoid entering the weaker equivalence recording.

2008-09-11  Richard Guenther  <rguenther@suse.de>

	* tree-ssa-uncprop.c (associate_equivalences_with_edges): Avoid
	entering the weaker equivalence recording.

	* tree-ssa-phiprop.c (propagate_with_phi): Fix tuplification.

From-SVN: r140300

gcc/ChangeLog

+2008-09-11  Richard Guenther  <rguenther@suse.de>
+
+	* tree-ssa-uncprop.c (associate_equivalences_with_edges): Avoid
+	entering the weaker equivalence recording.
+
+	* tree-ssa-phiprop.c (propagate_with_phi): Fix tuplification.
+
 2008-09-11  Jeff Law <law@redhat.com>
 
 	* reload1.c (alter_reg): Undo the BYTE_BIG_ENDIAN correction performed

gcc/tree-ssa-phiprop.c

@@ -247,7 +247,7 @@ propagate_with_phi (basic_block bb, gimple phi, struct phiprop_d *phivn,
 	         || phivn[SSA_NAME_VERSION (arg)].value == NULL_TREE))
 	{
 	  gimple def_stmt = SSA_NAME_DEF_STMT (arg);
-	  if (gimple_code (def_stmt) != GIMPLE_ASSIGN)
+	  if (!gimple_assign_single_p (def_stmt))
 	    return false;
 	  arg = gimple_assign_rhs1 (def_stmt);
 	}

gcc/tree-ssa-uncprop.c

@@ -137,11 +137,11 @@ associate_equivalences_with_edges (void)
 		    }
 		}
 
-	      if (TREE_CODE (op0) == SSA_NAME
-		  && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (op0)
-		  && (is_gimple_min_invariant (op1)
-		      || (TREE_CODE (op1) == SSA_NAME
-			  && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (op1))))
+	      else if (TREE_CODE (op0) == SSA_NAME
+		       && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (op0)
+		       && (is_gimple_min_invariant (op1)
+			   || (TREE_CODE (op1) == SSA_NAME
+			       && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (op1))))
 		{
 		  /* For IEEE, -0.0 == 0.0, so we don't necessarily know
 		     the sign of a variable compared against zero.  If