* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173737 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b8ee6d3..d1a0b67 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * 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  <martint@google.com>
 
        PR gcov-profile/47793
@@ -23,8 +31,7 @@
 
 2011-05-13  H.J. Lu  <hongjiu.lu@intel.com>
 
-       * 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 5bafc0f..482568c 100644 (file)
--- 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 0f0dfb3..bf34115 100644 (file)
--- 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 fe073f3..ad8e477 100644 (file)
--- 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);