diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 17 |
2 files changed, 24 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8e4aed8..61cf4d7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-06-03 Jakub Jelinek <jakub@redhat.com> + + PR debug/44375 + * tree-cfg.c (gimple_can_merge_blocks_p): For -O0 + return false if merging the bbs would lead to goto_locus + location being lost from the IL. + 2010-06-03 Jan Hubicka <jh@suse.cz> Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 7db5192..eca3ed0 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -1475,6 +1475,23 @@ gimple_can_merge_blocks_p (basic_block a, basic_block b) && name_mappings_registered_p ()) return false; + /* When not optimizing, don't merge if we'd lose goto_locus. */ + if (!optimize + && single_succ_edge (a)->goto_locus != UNKNOWN_LOCATION) + { + location_t goto_locus = single_succ_edge (a)->goto_locus; + gimple_stmt_iterator prev, next; + prev = gsi_last_nondebug_bb (a); + next = gsi_after_labels (b); + if (!gsi_end_p (next) && is_gimple_debug (gsi_stmt (next))) + gsi_next_nondebug (&next); + if ((gsi_end_p (prev) + || gimple_location (gsi_stmt (prev)) != goto_locus) + && (gsi_end_p (next) + || gimple_location (gsi_stmt (next)) != goto_locus)) + return false; + } + return true; } |