aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-ssa-tail-merge.c
diff options
context:
space:
mode:
authorTom de Vries <tom@codesourcery.com>2013-11-14 00:10:42 +0000
committerTom de Vries <vries@gcc.gnu.org>2013-11-14 00:10:42 +0000
commitb4e48861dfd6ec635b252dc13a5b19a2df237cc7 (patch)
tree374322382bce0dcc52445ff4261931542fd1ecae /gcc/tree-ssa-tail-merge.c
parentb6366520fa4bdf20c884457f027b5c4701cd3bbe (diff)
downloadgcc-b4e48861dfd6ec635b252dc13a5b19a2df237cc7.zip
gcc-b4e48861dfd6ec635b252dc13a5b19a2df237cc7.tar.gz
gcc-b4e48861dfd6ec635b252dc13a5b19a2df237cc7.tar.bz2
Handle GIMPLE_ASSIGNs with different vuse in gimple_equal_p
2013-11-14 Tom de Vries <tom@codesourcery.com> * tree-ssa-tail-merge.c (gimple_equal_p): Add test for structural equality for GIMPLE_ASSIGN. * gcc.dg/tail-merge-store.c: New test. From-SVN: r204767
Diffstat (limited to 'gcc/tree-ssa-tail-merge.c')
-rw-r--r--gcc/tree-ssa-tail-merge.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index ca69b23..c97da97 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -1142,8 +1142,17 @@ gimple_equal_p (same_succ same_succ, gimple s1, gimple s2)
lhs2 = gimple_get_lhs (s2);
if (TREE_CODE (lhs1) != SSA_NAME
&& TREE_CODE (lhs2) != SSA_NAME)
- return (vn_valueize (gimple_vdef (s1))
- == vn_valueize (gimple_vdef (s2)));
+ {
+ /* If the vdef is the same, it's the same statement. */
+ if (vn_valueize (gimple_vdef (s1))
+ == vn_valueize (gimple_vdef (s2)))
+ return true;
+
+ /* Test for structural equality. */
+ return (operand_equal_p (lhs1, lhs2, 0)
+ && gimple_operand_equal_value_p (gimple_assign_rhs1 (s1),
+ gimple_assign_rhs1 (s2)));
+ }
else if (TREE_CODE (lhs1) == SSA_NAME
&& TREE_CODE (lhs2) == SSA_NAME)
return vn_valueize (lhs1) == vn_valueize (lhs2);