From 5373158fd475af45c768f0438333866c9f4eb756 Mon Sep 17 00:00:00 2001 From: kazu Date: Sat, 27 Nov 2004 17:26:17 +0000 Subject: [PATCH] * tree.c (operand_equal_for_phi_arg_p): New. * tree.h: Add a prototype for operand_equal_for_phi_arg_p. * tree-cfg.c, tree-ssa-dom.c, tree-ssa-phiopt.c, tree-ssa.c: Replace operand_equal_p with operand_for_phi_arg_p appropriately. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91385 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/tree-cfg.c | 2 +- gcc/tree-ssa-dom.c | 4 ++-- gcc/tree-ssa-phiopt.c | 8 ++++---- gcc/tree-ssa.c | 2 +- gcc/tree.c | 16 ++++++++++++++++ gcc/tree.h | 1 + 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c249c02f4f7..95ae7a72617 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-11-27 Kazu Hirata + + * tree.c (operand_equal_for_phi_arg_p): New. + * tree.h: Add a prototype for operand_equal_for_phi_arg_p. + * tree-cfg.c, tree-ssa-dom.c, tree-ssa-phiopt.c, tree-ssa.c: + Replace operand_equal_p with operand_for_phi_arg_p + appropriately. + 2004-11-27 John David Anglin PR pch/14940 diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index bcf3d3e0535..37a6920b34c 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -2278,7 +2278,7 @@ phi_alternatives_equal (basic_block dest, edge e1, edge e2) val1 = PHI_ARG_DEF (phi, n1); val2 = PHI_ARG_DEF (phi, n2); - if (!operand_equal_p (val1, val2, 0)) + if (!operand_equal_for_phi_arg_p (val1, val2)) return false; } diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c index 5af8489fa41..a2d145922b5 100644 --- a/gcc/tree-ssa-dom.c +++ b/gcc/tree-ssa-dom.c @@ -1180,7 +1180,7 @@ record_equivalences_from_phis (basic_block bb) if (TREE_CODE (t) == SSA_NAME || is_gimple_min_invariant (t)) { /* Ignore alternatives which are the same as our LHS. */ - if (operand_equal_p (lhs, t, 0)) + if (operand_equal_for_phi_arg_p (lhs, t)) continue; /* If we have not processed an alternative yet, then set @@ -1190,7 +1190,7 @@ record_equivalences_from_phis (basic_block bb) /* If we have processed an alternative (stored in RHS), then see if it is equal to this one. If it isn't, then stop the search. */ - else if (! operand_equal_p (rhs, t, 0)) + else if (! operand_equal_for_phi_arg_p (rhs, t)) break; } else diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 3c241e43fc5..b6cfa7a028c 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -450,10 +450,10 @@ value_replacement (basic_block bb, tree phi, tree arg0, tree arg1) We now need to verify that the two arguments in the PHI node match the two arguments to the equality comparison. */ - if ((operand_equal_p (arg0, TREE_OPERAND (cond, 0), 0) - && operand_equal_p (arg1, TREE_OPERAND (cond, 1), 0)) - || (operand_equal_p (arg1, TREE_OPERAND (cond, 0), 0) - && operand_equal_p (arg0, TREE_OPERAND (cond, 1), 0))) + if ((operand_equal_for_phi_arg_p (arg0, TREE_OPERAND (cond, 0)) + && operand_equal_for_phi_arg_p (arg1, TREE_OPERAND (cond, 1))) + || (operand_equal_for_phi_arg_p (arg1, TREE_OPERAND (cond, 0)) + && operand_equal_for_phi_arg_p (arg0, TREE_OPERAND (cond, 1)))) { edge e; tree arg; diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c index 4aa8b26cc46..adb6a51fbdf 100644 --- a/gcc/tree-ssa.c +++ b/gcc/tree-ssa.c @@ -1138,7 +1138,7 @@ check_phi_redundancy (tree phi, tree *eq_to) } if (val - && !operand_equal_p (val, def, 0)) + && !operand_equal_for_phi_arg_p (val, def)) return; val = def; diff --git a/gcc/tree.c b/gcc/tree.c index 9fb3628261d..961dfb8ff39 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -6150,4 +6150,20 @@ lower_bound_in_type (tree outer, tree inner) build_int_cst_wide (inner, lo, hi)); } +/* Return nonzero if two operands that are suitable for PHI nodes are + necessarily equal. Specifically, both ARG0 and ARG1 must be either + SSA_NAME or invariant. Note that this is strictly an optimization. + That is, callers of this function can directly call operand_equal_p + and get the same result, only slower. */ + +int +operand_equal_for_phi_arg_p (tree arg0, tree arg1) +{ + if (arg0 == arg1) + return 1; + if (TREE_CODE (arg0) == SSA_NAME || TREE_CODE (arg1) == SSA_NAME) + return 0; + return operand_equal_p (arg0, arg1, 0); +} + #include "gt-tree.h" diff --git a/gcc/tree.h b/gcc/tree.h index 0f109a0c34b..b9ce3acd965 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -3442,6 +3442,7 @@ extern bool commutative_tree_code (enum tree_code); extern tree get_case_label (tree); extern tree upper_bound_in_type (tree, tree); extern tree lower_bound_in_type (tree, tree); +extern int operand_equal_for_phi_arg_p (tree, tree); /* In stmt.c */ -- 2.11.4.GIT