OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Dehao Chen 2012-11-27 14:39:33 +00:00 committed by Dehao Chen
parent bc9ec75f22
commit fbc68f2a00
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -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

5
gcc/cfgrtl.c
View File

@ -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)