From 2262707f736b97903782f843e28965f313b60c44 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 16 Nov 2010 12:57:34 +0000 Subject: tree-ssa-sccvn.c (visit_unary_op): Rename to ... 2010-11-16 Richard Guenther * tree-ssa-sccvn.c (visit_unary_op): Rename to ... (visit_nary_op): ... this. (visit_binary_op): Remove. (visit_use): Adjust and handle GIMPLE_TERNARY_RHS. * gcc.dg/tree-ssa/ssa-fre-30.c: New testcase. From-SVN: r166795 --- gcc/tree-ssa-sccvn.c | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) (limited to 'gcc/tree-ssa-sccvn.c') diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 994e945..01b66ae 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -2167,41 +2167,17 @@ visit_copy (tree lhs, tree rhs) return set_ssa_val_to (lhs, rhs); } -/* Visit a unary operator RHS, value number it, and return true if the +/* Visit a nary operator RHS, value number it, and return true if the value number of LHS has changed as a result. */ static bool -visit_unary_op (tree lhs, gimple stmt) +visit_nary_op (tree lhs, gimple stmt) { bool changed = false; tree result = vn_nary_op_lookup_stmt (stmt, NULL); if (result) - { - changed = set_ssa_val_to (lhs, result); - } - else - { - changed = set_ssa_val_to (lhs, lhs); - vn_nary_op_insert_stmt (stmt, lhs); - } - - return changed; -} - -/* Visit a binary operator RHS, value number it, and return true if the - value number of LHS has changed as a result. */ - -static bool -visit_binary_op (tree lhs, gimple stmt) -{ - bool changed = false; - tree result = vn_nary_op_lookup_stmt (stmt, NULL); - - if (result) - { - changed = set_ssa_val_to (lhs, result); - } + changed = set_ssa_val_to (lhs, result); else { changed = set_ssa_val_to (lhs, lhs); @@ -2909,10 +2885,9 @@ visit_use (tree use) switch (get_gimple_rhs_class (gimple_assign_rhs_code (stmt))) { case GIMPLE_UNARY_RHS: - changed = visit_unary_op (lhs, stmt); - break; case GIMPLE_BINARY_RHS: - changed = visit_binary_op (lhs, stmt); + case GIMPLE_TERNARY_RHS: + changed = visit_nary_op (lhs, stmt); break; case GIMPLE_SINGLE_RHS: switch (TREE_CODE_CLASS (gimple_assign_rhs_code (stmt))) @@ -2921,10 +2896,10 @@ visit_use (tree use) /* VOP-less references can go through unary case. */ if ((gimple_assign_rhs_code (stmt) == REALPART_EXPR || gimple_assign_rhs_code (stmt) == IMAGPART_EXPR - || gimple_assign_rhs_code (stmt) == VIEW_CONVERT_EXPR ) + || gimple_assign_rhs_code (stmt) == VIEW_CONVERT_EXPR) && TREE_CODE (TREE_OPERAND (gimple_assign_rhs1 (stmt), 0)) == SSA_NAME) { - changed = visit_unary_op (lhs, stmt); + changed = visit_nary_op (lhs, stmt); break; } /* Fallthrough. */ @@ -2935,7 +2910,7 @@ visit_use (tree use) case tcc_expression: if (gimple_assign_rhs_code (stmt) == ADDR_EXPR) { - changed = visit_unary_op (lhs, stmt); + changed = visit_nary_op (lhs, stmt); break; } /* Fallthrough. */ -- cgit v1.1