From dc764d10fa02c67d5a8748ce5f4c14096224ff89 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 13 May 2011 20:02:42 +0000 Subject: [PATCH] cfgrtl.c (cfg_layout_redirect_edge_and_branch): Adjust dump message. * cfgrtl.c (cfg_layout_redirect_edge_and_branch): Adjust dump message. * regcprop.c (copyprop_hardreg_forward): Test MAY_HAVE_DEBUG_INSNS in lieu of MAY_HAVE_DEBUG_STMTS. * tree-cfgcleanup.c (remove_forwarder_block): Do not attempt to move debug statements if !MAY_HAVE_DEBUG_STMTS. From-SVN: r173737 --- gcc/ChangeLog | 11 +++++++++-- gcc/cfgrtl.c | 2 +- gcc/regcprop.c | 4 ++-- gcc/tree-cfgcleanup.c | 5 ++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b8ee6d38d8b..d1a0b673c38 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-05-13 Eric Botcazou + + * cfgrtl.c (cfg_layout_redirect_edge_and_branch): Adjust dump message. + * regcprop.c (copyprop_hardreg_forward): Test MAY_HAVE_DEBUG_INSNS in + lieu of MAY_HAVE_DEBUG_STMTS. + * tree-cfgcleanup.c (remove_forwarder_block): Do not attempt to move + debug statements if !MAY_HAVE_DEBUG_STMTS. + 2011-05-13 Martin Thuresson PR gcov-profile/47793 @@ -23,8 +31,7 @@ 2011-05-13 H.J. Lu - * config/i386/i386.c (ix86_save_reg): Change return type to - bool. + * config/i386/i386.c (ix86_save_reg): Change return type to bool. (ix86_hard_regno_mode_ok): Change return value to bool. Use can_create_pseudo_p (). diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 5bafc0f3c25..482568c921e 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -2608,7 +2608,7 @@ cfg_layout_redirect_edge_and_branch (edge e, basic_block dest) delete_insn (BB_END (src)); } if (dump_file) - fprintf (dump_file, "Fallthru edge %i->%i redirected to %i\n", + fprintf (dump_file, "Redirecting fallthru edge %i->%i to %i\n", e->src->index, e->dest->index, dest->index); ret = redirect_edge_succ_nodup (e, dest); } diff --git a/gcc/regcprop.c b/gcc/regcprop.c index 0f0dfb3ce78..bf34115f1dc 100644 --- a/gcc/regcprop.c +++ b/gcc/regcprop.c @@ -990,7 +990,7 @@ copyprop_hardreg_forward (void) visited = sbitmap_alloc (last_basic_block); sbitmap_zero (visited); - if (MAY_HAVE_DEBUG_STMTS) + if (MAY_HAVE_DEBUG_INSNS) debug_insn_changes_pool = create_alloc_pool ("debug insn changes pool", sizeof (struct queued_debug_insn_change), 256); @@ -1029,7 +1029,7 @@ copyprop_hardreg_forward (void) copyprop_hardreg_forward_1 (bb, all_vd + bb->index); } - if (MAY_HAVE_DEBUG_STMTS) + if (MAY_HAVE_DEBUG_INSNS) { FOR_EACH_BB (bb) if (TEST_BIT (visited, bb->index) diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c index fe073f35529..ad8e4777a05 100644 --- a/gcc/tree-cfgcleanup.c +++ b/gcc/tree-cfgcleanup.c @@ -420,7 +420,7 @@ remove_forwarder_block (basic_block bb) } } - can_move_debug_stmts = single_pred_p (dest); + can_move_debug_stmts = MAY_HAVE_DEBUG_STMTS && single_pred_p (dest); /* Redirect the edges. */ for (ei = ei_start (bb->preds); (e = ei_safe_edge (ei)); ) @@ -476,8 +476,7 @@ remove_forwarder_block (basic_block bb) gsi_next (&gsi); } - /* Move debug statements if the destination has just a single - predecessor. */ + /* Move debug statements if the destination has a single predecessor. */ if (can_move_debug_stmts) { gsi_to = gsi_after_labels (dest);