diff options
| author | Dehao Chen <dehao@google.com> | 2012-11-27 14:39:33 +0000 |
|---|---|---|
| committer | Dehao Chen <dehao@gcc.gnu.org> | 2012-11-27 14:39:33 +0000 |
| commit | fbc68f2a00aedf4351488ecbb45b80cecf3b3f2e (patch) | |
| tree | 01e2781c3b04a45210556fe58bcd6297e74de415 /gcc | |
| parent | bc9ec75f2293ee4badf73d4f65da9c81249bf862 (diff) | |
| download | gcc-fbc68f2a00aedf4351488ecbb45b80cecf3b3f2e.zip gcc-fbc68f2a00aedf4351488ecbb45b80cecf3b3f2e.tar.gz gcc-fbc68f2a00aedf4351488ecbb45b80cecf3b3f2e.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cfgrtl.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6742bbf..da5ccea 100644 --- 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 a5bb974..197f871 100644 --- 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) |