diff options
Diffstat (limited to 'gcc/cfgexpand.c')
| -rw-r--r-- | gcc/cfgexpand.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index d22facbabe3..943a0704168 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -1,5 +1,5 @@ /* A pass for lowering trees to RTL. - Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. @@ -1316,7 +1316,7 @@ expand_gimple_cond_expr (basic_block bb, tree stmt) add_reg_br_prob_note (last, true_edge->probability); maybe_dump_rtl_for_tree_stmt (stmt, last); if (true_edge->goto_locus) - set_curr_insn_source_location (location_from_locus (true_edge->goto_locus)); + set_curr_insn_source_location (true_edge->goto_locus); false_edge->flags |= EDGE_FALLTHRU; return NULL; } @@ -1326,7 +1326,7 @@ expand_gimple_cond_expr (basic_block bb, tree stmt) add_reg_br_prob_note (last, false_edge->probability); maybe_dump_rtl_for_tree_stmt (stmt, last); if (false_edge->goto_locus) - set_curr_insn_source_location (location_from_locus (false_edge->goto_locus)); + set_curr_insn_source_location (false_edge->goto_locus); true_edge->flags |= EDGE_FALLTHRU; return NULL; } @@ -1357,7 +1357,7 @@ expand_gimple_cond_expr (basic_block bb, tree stmt) maybe_dump_rtl_for_tree_stmt (stmt, last2); if (false_edge->goto_locus) - set_curr_insn_source_location (location_from_locus (false_edge->goto_locus)); + set_curr_insn_source_location (false_edge->goto_locus); return new_bb; } @@ -1624,7 +1624,7 @@ expand_gimple_basic_block (basic_block bb) { emit_jump (label_rtx_for_bb (e->dest)); if (e->goto_locus) - set_curr_insn_source_location (location_from_locus (e->goto_locus)); + set_curr_insn_source_location (e->goto_locus); e->flags &= ~EDGE_FALLTHRU; } @@ -1724,11 +1724,7 @@ construct_exit_block (void) /* Make sure the locus is set to the end of the function, so that epilogue line numbers and warnings are set properly. */ -#ifdef USE_MAPPED_LOCATION if (cfun->function_end_locus != UNKNOWN_LOCATION) -#else - if (cfun->function_end_locus.file) -#endif input_location = cfun->function_end_locus; /* The following insns belong to the top scope. */ |