diff options
| author | Dehao Chen <dehao@google.com> | 2012-11-27 14:39:33 +0000 |
|---|---|---|
| committer | Dehao Chen <dehao@google.com> | 2012-11-27 14:39:33 +0000 |
| commit | b62543f837709261d73b52fd6a1a520c0747d2bc (patch) | |
| tree | 01e2781c3b04a45210556fe58bcd6297e74de415 /gcc/cfgrtl.c | |
| parent | ffa2db96068df3bda48a7bc43e7cce6365902fa9 (diff) | |
2012-11-27 Dehao Chen <dehao@google.com>
* cfgrtl.c (rtl_merge_blocks): Check with UNKNOWN_LOCATION correctly.
(cfg_layout_merge_blocks): Likewise.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@193852 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cfgrtl.c')
| -rw-r--r-- | gcc/cfgrtl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index a5bb97462a6..197f8718116 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) |