diff options
| author | Dehao Chen <dehao@google.com> | 2012-09-27 17:06:22 +0000 |
|---|---|---|
| committer | Dehao Chen <dehao@gcc.gnu.org> | 2012-09-27 17:06:22 +0000 |
| commit | 2f13f2de1f2a4da8da6015b18479a41d3e67eff2 (patch) | |
| tree | fa8cceb475f3f43ac9cb88a16f715c13ffc25604 /gcc/cfgrtl.c | |
| parent | 33adc2a3251455613837491b32de4fa5477da62a (diff) | |
| download | gcc-2f13f2de1f2a4da8da6015b18479a41d3e67eff2.zip gcc-2f13f2de1f2a4da8da6015b18479a41d3e67eff2.tar.gz gcc-2f13f2de1f2a4da8da6015b18479a41d3e67eff2.tar.bz2 | |
tree.h (tree_constructor): Remove IS_UNKNOWN_LOCATION.
2012-09-27 Dehao Chen <dehao@google.com>
* tree.h (tree_constructor): Remove IS_UNKNOWN_LOCATION.
(extern void protected_set_expr_location): Likewise.
(function_args_iter_next): Likewise.
(inlined_function_outer_scope_p): Likewise.
* input.h (IS_UNKNOWN_LOCATION): Likewise.
* fold-const.c (expr_location_or): Likewise.
* lto-cgraph.c (output_node_opt_summary): Likewise.
* dwarf2out.c (add_src_coords_attributes): Likewise.
* tree-eh.c (lower_try_finally_dup_block): Likewise.
* profile.c (branch_prob):
* cfgexpand.c (expand_gimple_cond): Likewise.
(expand_gimple_basic_block): Likewise.
(construct_exit_block): Likewise.
(gimple_expand_cfg): Likewise.
* cfgcleanup.c (try_forward_edges): Likewise.
* tree-ssa-live.c (remove_unused_scope_block_p): Likewise.
(dump_scope_block): Likewise.
* ipa-prop.c (ipa_write_jump_function): Likewise.
* rtl.h (extern void rtl_check_failed_flag): Likewise.
* gimple.h (gimple_set_location): Likewise.
(gimple_has_location): Likewise.
* cfgrtl.c (unique_locus_on_edge_between_p): Likewise.
(force_nonfallthru_and_redirect): Likewise.
(fixup_reorder_chain): Likewise.
(cfg_layout_merge_blocks): Likewise.
From-SVN: r191810
Diffstat (limited to 'gcc/cfgrtl.c')
| -rw-r--r-- | gcc/cfgrtl.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index c04482e..ad18400 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -723,7 +723,7 @@ unique_locus_on_edge_between_p (basic_block a, basic_block b) const location_t goto_locus = EDGE_SUCC (a, 0)->goto_locus; rtx insn, end; - if (IS_UNKNOWN_LOCATION (goto_locus)) + if (LOCATION_LOCUS (goto_locus) == UNKNOWN_LOCATION) return false; /* First scan block A backward. */ @@ -1477,10 +1477,7 @@ force_nonfallthru_and_redirect (edge e, basic_block target, rtx jump_label) else jump_block = e->src; - if (!IS_UNKNOWN_LOCATION (e->goto_locus)) - loc = e->goto_locus; - else - loc = 0; + loc = e->goto_locus; e->flags &= ~EDGE_FALLTHRU; if (target == EXIT_BLOCK_PTR) { @@ -3335,7 +3332,7 @@ fixup_reorder_chain (void) edge_iterator ei; FOR_EACH_EDGE (e, ei, bb->succs) - if (!IS_UNKNOWN_LOCATION (e->goto_locus) + if (LOCATION_LOCUS (e->goto_locus) != UNKNOWN_LOCATION && !(e->flags & EDGE_ABNORMAL)) { edge e2; @@ -3385,7 +3382,7 @@ fixup_reorder_chain (void) well, this can prevent other such blocks from being created in subsequent iterations of the loop. */ for (ei2 = ei_start (dest->preds); (e2 = ei_safe_edge (ei2)); ) - if (!IS_UNKNOWN_LOCATION (e2->goto_locus) + if (LOCATION_LOCUS (e2->goto_locus) != UNKNOWN_LOCATION && !(e2->flags & (EDGE_ABNORMAL | EDGE_FALLTHRU)) && e->goto_locus == e2->goto_locus) redirect_edge_and_branch (e2, nb); @@ -4087,7 +4084,8 @@ 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 && IS_UNKNOWN_LOCATION (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) |