diff options
author | dmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-27 20:33:38 +0000 |
---|---|---|
committer | dmalcolm <dmalcolm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-27 20:33:38 +0000 |
commit | ae799283c5ecc25191575fb5ec2bc16d97674437 (patch) | |
tree | 66e196517fd89856bf4cc787decc8acce49a4e4a /gcc/dwarf2cfi.c | |
parent | ede4900a3370698d85011d12fc89b3ff2e41e7bf (diff) | |
download | gcc-ae799283c5ecc25191575fb5ec2bc16d97674437.tar.gz |
Use rtx_expr_list for expr_status.x_forced_labels
gcc/
2014-08-27 David Malcolm <dmalcolm@redhat.com>
* function.h (struct expr_status): Strengthen field
"x_forced_labels" from rtx to rtx_expr_list *.
* cfgbuild.c (make_edges): Split local "x" into two locals,
strengthening one from rtx to rtx_expr_list *, and using methods
of said class.
* dwarf2cfi.c (create_trace_edges): Split local "lab" out; within
loop over forced_labels, introduce strengthen it from rtx to
rtx_expr_list *, using methods to clarify the code.
* jump.c (rebuild_jump_labels_1): Strengthen local "insn" from rtx
to rtx_expr_list *, using methods of said class to clarify the
code.
* reload1.c (set_initial_label_offsets): Split local "x" into two
per-loop variables, strengthening the first from rtx to
rtx_expr_list * and using methods.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214602 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/dwarf2cfi.c')
-rw-r--r-- | gcc/dwarf2cfi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index 25571fa7bcd..3f4a0ad6d5c 100644 --- a/gcc/dwarf2cfi.c +++ b/gcc/dwarf2cfi.c @@ -2286,7 +2286,7 @@ maybe_record_trace_start_abnormal (rtx start, rtx origin) static void create_trace_edges (rtx insn) { - rtx tmp, lab; + rtx tmp; int i, n; if (JUMP_P (insn)) @@ -2303,14 +2303,14 @@ create_trace_edges (rtx insn) n = GET_NUM_ELEM (vec); for (i = 0; i < n; ++i) { - lab = XEXP (RTVEC_ELT (vec, i), 0); + rtx lab = XEXP (RTVEC_ELT (vec, i), 0); maybe_record_trace_start (lab, insn); } } else if (computed_jump_p (insn)) { - for (lab = forced_labels; lab; lab = XEXP (lab, 1)) - maybe_record_trace_start (XEXP (lab, 0), insn); + for (rtx_expr_list *lab = forced_labels; lab; lab = lab->next ()) + maybe_record_trace_start (lab->element (), insn); } else if (returnjump_p (insn)) ; @@ -2319,13 +2319,13 @@ create_trace_edges (rtx insn) n = ASM_OPERANDS_LABEL_LENGTH (tmp); for (i = 0; i < n; ++i) { - lab = XEXP (ASM_OPERANDS_LABEL (tmp, i), 0); + rtx lab = XEXP (ASM_OPERANDS_LABEL (tmp, i), 0); maybe_record_trace_start (lab, insn); } } else { - lab = JUMP_LABEL (insn); + rtx lab = JUMP_LABEL (insn); gcc_assert (lab != NULL); maybe_record_trace_start (lab, insn); } @@ -2338,7 +2338,7 @@ create_trace_edges (rtx insn) /* Process non-local goto edges. */ if (can_nonlocal_goto (insn)) - for (lab = nonlocal_goto_handler_labels; lab; lab = XEXP (lab, 1)) + for (rtx lab = nonlocal_goto_handler_labels; lab; lab = XEXP (lab, 1)) maybe_record_trace_start_abnormal (XEXP (lab, 0), insn); } else if (rtx_sequence *seq = dyn_cast <rtx_sequence *> (PATTERN (insn))) |