diff options
| author | dehao <dehao@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-27 15:14:14 +0000 |
|---|---|---|
| committer | dehao <dehao@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-27 15:14:14 +0000 |
| commit | 65c56cfff2dd09ac5d7700beb266a8d25f9b7c98 (patch) | |
| tree | beb05ea993262ba566d1e1aac62be2fdddb9e4f2 | |
| parent | 6fd49b7c8d96a38c43c0ecb7da8f2079e3874c30 (diff) | |
| download | gcc-65c56cfff2dd09ac5d7700beb266a8d25f9b7c98.tar.gz | |
Backport 193852 from trunk:
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: svn+ssh://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7@193854 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.google-4_7 | 10 | ||||
| -rw-r--r-- | gcc/cfgrtl.c | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/ChangeLog.google-4_7 b/gcc/ChangeLog.google-4_7 index ea4855a110d..0f1bcda2346 100644 --- a/gcc/ChangeLog.google-4_7 +++ b/gcc/ChangeLog.google-4_7 @@ -1,3 +1,13 @@ +2012-11-27 Dehao Chen <dehao@google.com> + + Backport 193852 from trunk: + + 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-26 Easwaran Raman <eraman@google.com> Backport 193554 from trunk: diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 17b630ade5a..c89b4d3e07f 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -701,7 +701,8 @@ rtl_merge_blocks (basic_block a, basic_block b) BB_END (a) = a_end; /* 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) @@ -2935,7 +2936,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) |