diff options
| -rw-r--r-- | gcc/ChangeLog | 16 | ||||
| -rw-r--r-- | gcc/gimple-pretty-print.c | 99 | ||||
| -rw-r--r-- | gcc/tree-flow.h | 4 | ||||
| -rw-r--r-- | gcc/tree-pretty-print.c | 34 |
4 files changed, 106 insertions, 47 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1757883fcac..9f3f0ee7ef7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,19 @@ +2009-01-02 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/38690 + * tree-flow.h (op_code_prio, op_prio): New prototypes. + * tree-pretty-print.c (op_code_prio): New function. + (op_prio): No longer static. Use op_code_prio. + * gimple-pretty-print.c (dump_unary_rhs, dump_binary_rhs): + Use op_prio and op_code_prio to determine if () should be + printed around operand(s) or not. + + * gimple-pretty-print.c (dump_unary_rhs, dump_binary_rhs, + dump_gimple_call, dump_gimple_switch, dump_gimple_cond, + dump_gimple_label, dump_gimple_try, dump_symbols, dump_gimple_phi, + dump_gimple_mem_ops, dump_bb_header, dump_bb_end, pp_cfg_jump): Use + pp_character instead of pp_string for single letter printing. + 2009-01-02 Richard Sandiford <rdsandiford@googlemail.com> * doc/extend.texi: Fix '#pragma GCC option' typo. diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c index 16ff6e1eb85..733a449cace 100644 --- a/gcc/gimple-pretty-print.c +++ b/gcc/gimple-pretty-print.c @@ -1,5 +1,5 @@ /* Pretty formatting of GIMPLE statements and expressions. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Aldy Hernandez <aldyh@redhat.com> and Diego Novillo <dnovillo@google.com> @@ -257,10 +257,17 @@ dump_unary_rhs (pretty_printer *buffer, gimple gs, int spc, int flags) case FIX_TRUNC_EXPR: case FLOAT_EXPR: CASE_CONVERT: - pp_string (buffer, "("); + pp_character (buffer, '('); dump_generic_node (buffer, TREE_TYPE (lhs), spc, flags, false); pp_string (buffer, ") "); - dump_generic_node (buffer, rhs, spc, flags, false); + if (op_prio (rhs) < op_code_prio (rhs_code)) + { + pp_character (buffer, '('); + dump_generic_node (buffer, rhs, spc, flags, false); + pp_character (buffer, ')'); + } + else + dump_generic_node (buffer, rhs, spc, flags, false); break; case PAREN_EXPR: @@ -272,7 +279,7 @@ dump_unary_rhs (pretty_printer *buffer, gimple gs, int spc, int flags) case ABS_EXPR: pp_string (buffer, "ABS_EXPR <"); dump_generic_node (buffer, rhs, spc, flags, false); - pp_string (buffer, ">"); + pp_character (buffer, '>'); break; default: @@ -282,21 +289,31 @@ dump_unary_rhs (pretty_printer *buffer, gimple gs, int spc, int flags) || rhs_code == SSA_NAME || rhs_code == ADDR_EXPR || rhs_code == CONSTRUCTOR) - ; /* do nothing. */ + { + dump_generic_node (buffer, rhs, spc, flags, false); + break; + } else if (rhs_code == BIT_NOT_EXPR) - pp_string (buffer, "~"); + pp_character (buffer, '~'); else if (rhs_code == TRUTH_NOT_EXPR) - pp_string (buffer, "!"); + pp_character (buffer, '!'); else if (rhs_code == NEGATE_EXPR) - pp_string (buffer, "-"); + pp_character (buffer, '-'); else { - pp_string (buffer, "["); + pp_character (buffer, '['); pp_string (buffer, tree_code_name [rhs_code]); pp_string (buffer, "] "); } - dump_generic_node (buffer, rhs, spc, flags, false); + if (op_prio (rhs) < op_code_prio (rhs_code)) + { + pp_character (buffer, '('); + dump_generic_node (buffer, rhs, spc, flags, false); + pp_character (buffer, ')'); + } + else + dump_generic_node (buffer, rhs, spc, flags, false); break; } } @@ -334,11 +351,27 @@ dump_binary_rhs (pretty_printer *buffer, gimple gs, int spc, int flags) break; default: - dump_generic_node (buffer, gimple_assign_rhs1 (gs), spc, flags, false); + if (op_prio (gimple_assign_rhs1 (gs)) <= op_code_prio (code)) + { + pp_character (buffer, '('); + dump_generic_node (buffer, gimple_assign_rhs1 (gs), spc, flags, + false); + pp_character (buffer, ')'); + } + else + dump_generic_node (buffer, gimple_assign_rhs1 (gs), spc, flags, false); pp_space (buffer); pp_string (buffer, op_symbol_code (gimple_assign_rhs_code (gs))); pp_space (buffer); - dump_generic_node (buffer, gimple_assign_rhs2 (gs), spc, flags, false); + if (op_prio (gimple_assign_rhs2 (gs)) <= op_code_prio (code)) + { + pp_character (buffer, '('); + dump_generic_node (buffer, gimple_assign_rhs2 (gs), spc, flags, + false); + pp_character (buffer, ')'); + } + else + dump_generic_node (buffer, gimple_assign_rhs2 (gs), spc, flags, false); } } @@ -461,7 +494,7 @@ dump_gimple_call (pretty_printer *buffer, gimple gs, int spc, int flags) pp_string (buffer, ", "); dump_gimple_call_args (buffer, gs, flags); } - pp_string (buffer, ">"); + pp_character (buffer, '>'); } else { @@ -478,7 +511,7 @@ dump_gimple_call (pretty_printer *buffer, gimple gs, int spc, int flags) dump_generic_node (buffer, gimple_call_fn (gs), spc, flags, false); pp_string (buffer, " ("); dump_gimple_call_args (buffer, gs, flags); - pp_string (buffer, ")"); + pp_character (buffer, ')'); if (!(flags & TDF_RHS_ONLY)) pp_semicolon (buffer); } @@ -524,12 +557,12 @@ dump_gimple_switch (pretty_printer *buffer, gimple gs, int spc, int flags) continue; dump_generic_node (buffer, case_label, spc, flags, false); - pp_string (buffer, " "); + pp_character (buffer, ' '); dump_generic_node (buffer, CASE_LABEL (case_label), spc, flags, false); if (i < gimple_switch_num_labels (gs) - 1) pp_string (buffer, ", "); } - pp_string (buffer, ">"); + pp_character (buffer, '>'); } @@ -555,7 +588,7 @@ dump_gimple_cond (pretty_printer *buffer, gimple gs, int spc, int flags) dump_generic_node (buffer, gimple_cond_rhs (gs), spc, flags, false); if (!(flags & TDF_RHS_ONLY)) { - pp_string (buffer, ")"); + pp_character (buffer, ')'); if (gimple_cond_true_label (gs)) { @@ -589,7 +622,7 @@ dump_gimple_label (pretty_printer *buffer, gimple gs, int spc, int flags) else { dump_generic_node (buffer, label, spc, flags, false); - pp_string (buffer, ":"); + pp_character (buffer, ':'); } if (DECL_NONLOCAL (label)) pp_string (buffer, " [non-local]"); @@ -667,26 +700,26 @@ dump_gimple_try (pretty_printer *buffer, gimple gs, int spc, int flags) { pp_string (buffer, "try"); newline_and_indent (buffer, spc + 2); - pp_string (buffer, "{"); + pp_character (buffer, '{'); pp_newline (buffer); dump_gimple_seq (buffer, gimple_try_eval (gs), spc + 4, flags); newline_and_indent (buffer, spc + 2); - pp_string (buffer, "}"); + pp_character (buffer, '}'); if (gimple_try_kind (gs) == GIMPLE_TRY_CATCH) { newline_and_indent (buffer, spc); pp_string (buffer, "catch"); newline_and_indent (buffer, spc + 2); - pp_string (buffer, "{"); + pp_character (buffer, '{'); } else if (gimple_try_kind (gs) == GIMPLE_TRY_FINALLY) { newline_and_indent (buffer, spc); pp_string (buffer, "finally"); newline_and_indent (buffer, spc + 2); - pp_string (buffer, "{"); + pp_character (buffer, '{'); } else pp_string (buffer, " <UNKNOWN GIMPLE_TRY> {"); @@ -1118,10 +1151,10 @@ dump_symbols (pretty_printer *buffer, bitmap syms, int flags) { tree sym = referenced_var_lookup (i); dump_generic_node (buffer, sym, 0, flags, false); - pp_string (buffer, " "); + pp_character (buffer, ' '); } - pp_string (buffer, "}"); + pp_character (buffer, '}'); } } @@ -1146,13 +1179,13 @@ dump_gimple_phi (pretty_printer *buffer, gimple phi, int spc, int flags) { dump_generic_node (buffer, gimple_phi_arg_def (phi, i), spc, flags, false); - pp_string (buffer, "("); + pp_character (buffer, '('); pp_decimal_int (buffer, gimple_phi_arg_edge (phi, i)->src->index); - pp_string (buffer, ")"); + pp_character (buffer, ')'); if (i < gimple_phi_num_args (phi) - 1) pp_string (buffer, ", "); } - pp_string (buffer, ">"); + pp_character (buffer, '>'); } @@ -1390,7 +1423,7 @@ dump_gimple_mem_ops (pretty_printer *buffer, gimple gs, int spc, int flags) pp_string (buffer, ", "); } - pp_string (buffer, ">"); + pp_character (buffer, '>'); if (flags & TDF_MEMSYMS) dump_symbols (buffer, gimple_loaded_syms (gs), flags); @@ -1414,7 +1447,7 @@ dump_gimple_mem_ops (pretty_printer *buffer, gimple gs, int spc, int flags) pp_string (buffer, ", "); } - pp_string (buffer, ">"); + pp_character (buffer, '>'); if ((flags & TDF_MEMSYMS) && vdefs->next == NULL) dump_symbols (buffer, gimple_stored_syms (gs), flags); @@ -1639,7 +1672,7 @@ dump_bb_header (pretty_printer *buffer, basic_block bb, int indent, int flags) FOR_EACH_EDGE (e, ei, bb->preds) if (flags & TDF_SLIM) { - pp_string (buffer, " "); + pp_character (buffer, ' '); if (e->src == ENTRY_BLOCK_PTR) pp_string (buffer, "ENTRY"); else @@ -1681,7 +1714,7 @@ dump_bb_end (pretty_printer *buffer, basic_block bb, int indent, int flags) FOR_EACH_EDGE (e, ei, bb->succs) if (flags & TDF_SLIM) { - pp_string (buffer, " "); + pp_character (buffer, ' '); if (e->dest == EXIT_BLOCK_PTR) pp_string (buffer, "EXIT"); else @@ -1727,12 +1760,12 @@ pp_cfg_jump (pretty_printer *buffer, basic_block bb) pp_string (buffer, "goto <bb "); pp_decimal_int (buffer, bb->index); - pp_string (buffer, ">"); + pp_character (buffer, '>'); if (stmt && gimple_code (stmt) == GIMPLE_LABEL) { pp_string (buffer, " ("); dump_generic_node (buffer, gimple_label_label (stmt), 0, 0, false); - pp_string (buffer, ")"); + pp_character (buffer, ')'); pp_semicolon (buffer); } else diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h index d4e0004d834..46578629673 100644 --- a/gcc/tree-flow.h +++ b/gcc/tree-flow.h @@ -1,5 +1,5 @@ /* Data and Control Flow Analysis for Trees. - Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Diego Novillo <dnovillo@redhat.com> @@ -752,6 +752,8 @@ extern bool cleanup_tree_cfg (void); /* In tree-pretty-print.c. */ extern void dump_generic_bb (FILE *, basic_block, int, int); +extern int op_code_prio (enum tree_code); +extern int op_prio (const_tree); extern const char *op_symbol_code (enum tree_code); /* In tree-dfa.c */ diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 5708eedf3b2..ff45ecc635d 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -1,5 +1,5 @@ /* Pretty formatting of GENERIC trees in C syntax. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Adapted from c-pretty-print.c by Diego Novillo <dnovillo@redhat.com> @@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see #include "predict.h" /* Local functions, macros and variables. */ -static int op_prio (const_tree); static const char *op_symbol (const_tree); static void pretty_print_string (pretty_printer *, const char*); static void print_call_name (pretty_printer *, const_tree); @@ -2223,7 +2222,7 @@ print_struct_decl (pretty_printer *buffer, const_tree node, int spc, int flags) pp_character (buffer, '}'); } -/* Return the priority of the operator OP. +/* Return the priority of the operator CODE. From lowest to highest precedence with either left-to-right (L-R) or right-to-left (R-L) associativity]: @@ -2247,13 +2246,10 @@ print_struct_decl (pretty_printer *buffer, const_tree node, int spc, int flags) unary +, - and * have higher precedence than the corresponding binary operators. */ -static int -op_prio (const_tree op) +int +op_code_prio (enum tree_code code) { - if (op == NULL) - return 9999; - - switch (TREE_CODE (op)) + switch (code) { case TREE_LIST: case COMPOUND_EXPR: @@ -2374,10 +2370,6 @@ op_prio (const_tree op) case VEC_PACK_SAT_EXPR: return 16; - case SAVE_EXPR: - case NON_LVALUE_EXPR: - return op_prio (TREE_OPERAND (op, 0)); - default: /* Return an arbitrarily high precedence to avoid surrounding single VAR_DECLs in ()s. */ @@ -2385,6 +2377,22 @@ op_prio (const_tree op) } } +/* Return the priority of the operator OP. */ + +int +op_prio (const_tree op) +{ + enum tree_code code; + + if (op == NULL) + return 9999; + + code = TREE_CODE (op); + if (code == SAVE_EXPR || code == NON_LVALUE_EXPR) + return op_prio (TREE_OPERAND (op, 0)); + + return op_code_prio (code); +} /* Return the symbol associated with operator CODE. */ |