From 6615c446157600e6dbe0b716f48e80a64e49807f Mon Sep 17 00:00:00 2001 From: "Jeffrey D. Oldham" Date: Fri, 17 Sep 2004 21:55:02 +0000 Subject: alias.c (find_base_decl): Remove unreachable case '3' block. 2004-09-17 Jeffrey D. Oldham Zack Weinberg * alias.c (find_base_decl): Remove unreachable case '3' block. * expr.c (safe_from_p): Abort if passed a type. * tree-gimple.c (recalculate_side_effects): Abort if passed anything other than an expression. * tree-ssa-pre.c (phi_translate): Return expr immediately if is_gimple_min_invariant is true for it. Reorder cases for clarity. Abort on un-handled tree classes. (valid_in_set): Likewise. * tree.c (tree_code_class_strings): New static data. * tree.h (enum tree_code_class): New. (tree_code_class_strings): Declare. (TREE_CODE_CLASS_STRING, EXCEPTIONAL_CLASS_P, CONSTANT_CLASS_P) (REFERENCE_CLASS_P, COMPARISON_CLASS_P, UNARY_CLASS_P, BINARY_CLASS_P) (STATEMENT_CLASS_P, EXPRESSION_CLASS_P, IS_TYPE_OR_DECL_P): New macros. (TYPE_P, DECL_P, IS_NON_TYPE_CODE_CLASS, IS_EXPR_CODE_CLASS) (checking macros, EXPR_LOCATION, SET_EXPR_LOCATION, EXPR_LOCUS): Update. * tree.def, c-common.def, objc/objc-tree.def: Use tree_code_class enumeration constants instead of code letters. * alias.c, builtins.c, c-common.c, c-format.c, c-lang.c, c-pragma.c * c-typeck.c, cgraphunit.c, convert.c, dbxout.c, dwarf2out.c * emit-rtl.c expr.c, fold-const.c, gimplify.c, lambda-code.c * langhooks.c, langhooks.h, predict.c, print-tree.c, reload1.c, stmt.c * tree-browser.c, tree-cfg.c, tree-chrec.c, tree-complex.c, tree-dfa.c * tree-dump.c, tree-eh.c, tree-gimple.c, tree-inline.c, tree-nested.c * tree-outof-ssa.c, tree-pretty-print.c, tree-sra.c, tree-ssa-ccp.c * tree-ssa-dce.c, tree-ssa-dom.c, tree-ssa-forwprop.c, tree-ssa-live.c * tree-ssa-loop-im.c, tree-ssa-loop-ivopts.c, tree-ssa-operands.c * tree-ssa-phiopt.c, tree-ssa-pre.c, tree-ssa-propagate.c * tree-ssa.c, tree-ssanames.c, tree-tailcall.c, tree.c, varasm.c * config/sol2-c.c, config/arm/arm.c, config/i386/winnt.c * config/pa/pa.c, config/pa/pa.h, config/sh/sh.c, objc/objc-lang.c Update to match. * LANGUAGES: Add note about change. ada: * ada-tree.def: Use tree_code_class enumeration constants instead of code letters. * ada-tree.h, decl.c, misc.c, trans.c, utils.c, utils2.c: Update for new tree-class enumeration constants. cp: * cp-tree.def: Use tree_code_class enumeration constants instead of code letters. * call.c, class.c, cp-gimplify.c, cp-lang.c, cxx-pretty-print.c * mangle.c, pt.c, semantics.c, tree.c, typeck.c: Update for new tree-class enumeration constants. fortran: * f95-lang.c, trans-expr.c, trans.c: Update for new tree-class enumeration constants. java: * java-tree.def: Use tree_code_class enumeration constants instead of code letters. * java-gimplify.c, jcf-write.c, lang.c, parse.y: Update for new tree-class enumeration constants. treelang: * treetree.c: Update for new tree-class enumeration constants. From-SVN: r87675 --- gcc/tree-ssa-pre.c | 99 +++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 50 deletions(-) (limited to 'gcc/tree-ssa-pre.c') diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index bf332f4..cbaba2c 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -848,15 +848,21 @@ phi_translate (tree expr, value_set_t set, basic_block pred, if (expr == NULL) return NULL; + if (is_gimple_min_invariant (expr)) + return expr; + /* Phi translations of a given expression don't change, */ phitrans = phi_trans_lookup (expr, pred); if (phitrans) return phitrans; - switch (TREE_CODE_CLASS (TREE_CODE (expr))) { - case '2': + case tcc_reference: + /* XXX: Until we have PRE of loads working, none will be ANTIC. */ + return NULL; + + case tcc_binary: { tree oldop1 = TREE_OPERAND (expr, 0); tree oldop2 = TREE_OPERAND (expr, 1); @@ -884,13 +890,9 @@ phi_translate (tree expr, value_set_t set, basic_block pred, phi_trans_add (oldexpr, newexpr, pred); } } - break; - /* XXX: Until we have PRE of loads working, none will be ANTIC. - */ - case 'r': - return NULL; - break; - case '1': + return expr; + + case tcc_unary: { tree oldop1 = TREE_OPERAND (expr, 0); tree newop1; @@ -911,10 +913,9 @@ phi_translate (tree expr, value_set_t set, basic_block pred, phi_trans_add (oldexpr, newexpr, pred); } } - break; - case 'd': - gcc_unreachable (); - case 'x': + return expr; + + case tcc_exceptional: { tree phi = NULL; int i; @@ -934,9 +935,11 @@ phi_translate (tree expr, value_set_t set, basic_block pred, return PHI_ARG_DEF (phi, i); } } - break; + return expr; + + default: + gcc_unreachable (); } - return expr; } static void @@ -1046,34 +1049,31 @@ valid_in_set (value_set_t set, tree expr) { switch (TREE_CODE_CLASS (TREE_CODE (expr))) { - case '2': + case tcc_binary: { tree op1 = TREE_OPERAND (expr, 0); tree op2 = TREE_OPERAND (expr, 1); return set_contains_value (set, op1) && set_contains_value (set, op2); } - break; - case '1': + + case tcc_unary: { tree op1 = TREE_OPERAND (expr, 0); return set_contains_value (set, op1); } - break; - /* XXX: Until PRE of loads works, no reference nodes are ANTIC. - */ - case 'r': - { - return false; - } - case 'x': - { - gcc_assert (TREE_CODE (expr) == SSA_NAME); - return true; - } - case 'c': - gcc_unreachable (); - } - return false; + + case tcc_reference: + /* XXX: Until PRE of loads works, no reference nodes are ANTIC. */ + return false; + + case tcc_exceptional: + gcc_assert (TREE_CODE (expr) == SSA_NAME); + return true; + + default: + /* No other cases should be encountered. */ + gcc_unreachable (); + } } /* Clean the set of expressions that are no longer valid in SET. This @@ -1291,9 +1291,9 @@ find_or_generate_expression (basic_block block, tree expr, tree stmts) if (genop == NULL) { genop = VALUE_HANDLE_EXPR_SET (expr)->head->expr; - gcc_assert (TREE_CODE_CLASS (TREE_CODE (genop)) == '1' - || TREE_CODE_CLASS (TREE_CODE (genop)) == '2' - || TREE_CODE_CLASS (TREE_CODE (genop)) == 'r'); + gcc_assert (UNARY_CLASS_P (genop) + || BINARY_CLASS_P (genop) + || REFERENCE_CLASS_P (genop)); genop = create_expression_by_pieces (block, genop, stmts); } return genop; @@ -1323,7 +1323,7 @@ create_expression_by_pieces (basic_block block, tree expr, tree stmts) switch (TREE_CODE_CLASS (TREE_CODE (expr))) { - case '2': + case tcc_binary: { tree_stmt_iterator tsi; tree genop1, genop2; @@ -1345,7 +1345,7 @@ create_expression_by_pieces (basic_block block, tree expr, tree stmts) pre_stats.insertions++; break; } - case '1': + case tcc_unary: { tree_stmt_iterator tsi; tree genop1; @@ -1423,8 +1423,8 @@ insert_aux (basic_block block) node; node = node->next) { - if (TREE_CODE_CLASS (TREE_CODE (node->expr)) == '2' - || TREE_CODE_CLASS (TREE_CODE (node->expr)) == '1') + if (BINARY_CLASS_P (node->expr) + || UNARY_CLASS_P (node->expr)) { tree *avail; tree val; @@ -1528,8 +1528,8 @@ insert_aux (basic_block block) tree builtexpr; bprime = pred->src; eprime = avail[bprime->index]; - if (TREE_CODE_CLASS (TREE_CODE (eprime)) == '2' - || TREE_CODE_CLASS (TREE_CODE (eprime)) == '1') + if (BINARY_CLASS_P (eprime) + || UNARY_CLASS_P (eprime)) { builtexpr = create_expression_by_pieces (bprime, eprime, @@ -1668,13 +1668,13 @@ create_value_expr_from (tree expr, basic_block block, vuse_optype vuses) enum tree_code code = TREE_CODE (expr); tree vexpr; - gcc_assert (TREE_CODE_CLASS (code) == '1' - || TREE_CODE_CLASS (code) == '2' - || TREE_CODE_CLASS (code) == 'r'); + gcc_assert (TREE_CODE_CLASS (code) == tcc_unary + || TREE_CODE_CLASS (code) == tcc_binary + || TREE_CODE_CLASS (code) == tcc_reference); - if (TREE_CODE_CLASS (code) == '1') + if (TREE_CODE_CLASS (code) == tcc_unary) vexpr = pool_alloc (unary_node_pool); - else if (TREE_CODE_CLASS (code) == 'r') + else if (TREE_CODE_CLASS (code) == tcc_reference) vexpr = pool_alloc (reference_node_pool); else vexpr = pool_alloc (binary_node_pool); @@ -1791,8 +1791,7 @@ compute_avail (basic_block block) value_insert_into_set (EXP_GEN (block), rhs); continue; } - else if (TREE_CODE_CLASS (TREE_CODE (rhs)) == '1' - || TREE_CODE_CLASS (TREE_CODE (rhs)) == '2' + else if (UNARY_CLASS_P (rhs) || BINARY_CLASS_P (rhs) || TREE_CODE (rhs) == INDIRECT_REF) { /* For binary, unary, and reference expressions, -- cgit v1.1