cfgrtl.c (rtl_merge_blocks): Check with UNKNOWN_LOCATION correctly.

2012-11-27  Dehao Chen  <dehao@google.com>

	* cfgrtl.c (rtl_merge_blocks): Check with UNKNOWN_LOCATION correctly.
	(cfg_layout_merge_blocks): Likewise.

From-SVN: r193852

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6742bbf4a8be944333e41b8b08ffe711e9dfc1b2..da5cceac2565ba12aa1008ec0430bbecb963b5db 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27  Dehao Chen  <dehao@google.com>
+
+       * cfgrtl.c (rtl_merge_blocks): Check with UNKNOWN_LOCATION correctly.
+       (cfg_layout_merge_blocks): Likewise.
+
 2012-11-27  Jakub Jelinek  <jakub@redhat.com>
 
        * passes.c (init_optimization_passes): Add pass_asan and pass_tsan

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index a5bb97462a657811c8ee1645319328a58d3271d1..197f8718116adb03610f590003dc00e08f6be652 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -890,7 +890,8 @@ rtl_merge_blocks (basic_block a, basic_block b)
   df_bb_delete (b->index);
 
   /* If B was a forwarder block, propagate the locus on the edge.  */
-  if (forwarder_p && !EDGE_SUCC (b, 0)->goto_locus)
+  if (forwarder_p
+      && LOCATION_LOCUS (EDGE_SUCC (b, 0)->goto_locus) == UNKNOWN_LOCATION)
     EDGE_SUCC (b, 0)->goto_locus = EDGE_SUCC (a, 0)->goto_locus;
 
   if (dump_file)
@@ -4149,7 +4150,7 @@ cfg_layout_merge_blocks (basic_block a, basic_block b)
 
   /* If B was a forwarder block, propagate the locus on the edge.  */
   if (forwarder_p
-      && LOCATION_LOCUS (EDGE_SUCC (b, 0)->goto_locus) != UNKNOWN_LOCATION)
+      && LOCATION_LOCUS (EDGE_SUCC (b, 0)->goto_locus) == UNKNOWN_LOCATION)
     EDGE_SUCC (b, 0)->goto_locus = EDGE_SUCC (a, 0)->goto_locus;
 
   if (dump_file)