From 8befe14b890ee312015f85b3adfc3d2ec883e36e Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 8 Jan 2014 13:00:29 -0500 Subject: [PATCH 101/159] FIXME: use rtx_sequence within dwarf2cfi.c --- gcc/dwarf2cfi.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index ec13817..8a417c3 100644 --- a/gcc/dwarf2cfi.c +++ b/gcc/dwarf2cfi.c @@ -2326,12 +2326,11 @@ create_trace_edges (rtx insn) for (lab = nonlocal_goto_handler_labels; lab; lab = XEXP (lab, 1)) maybe_record_trace_start_abnormal (XEXP (lab, 0), insn); } - else if (GET_CODE (PATTERN (insn)) == SEQUENCE) + else if (rtx_sequence seq = PATTERN (insn)->dyn_cast_rtx_sequence ()) { - rtx seq = PATTERN (insn); - int i, n = XVECLEN (seq, 0); + int i, n = seq->len (); for (i = 0; i < n; ++i) - create_trace_edges (XVECEXP (seq, 0, i)); + create_trace_edges (seq->element (i)); return; } @@ -2406,12 +2405,12 @@ scan_trace (dw_trace_info *trace) /* Handle all changes to the row state. Sequences require special handling for the positioning of the notes. */ - if (GET_CODE (PATTERN (insn)) == SEQUENCE) + if (rtx_sequence pat = PATTERN (insn)->dyn_cast_rtx_sequence ()) { - rtx elt, pat = PATTERN (insn); - int i, n = XVECLEN (pat, 0); + rtx elt; + int i, n = pat->len (); - control = XVECEXP (pat, 0, 0); + control = pat->element (0); if (can_throw_internal (control)) notice_eh_throw (control); dwarf2out_flush_queued_reg_saves (); @@ -2423,7 +2422,7 @@ scan_trace (dw_trace_info *trace) gcc_assert (!RTX_FRAME_RELATED_P (control)); gcc_assert (!find_reg_note (control, REG_ARGS_SIZE, NULL)); - elt = XVECEXP (pat, 0, 1); + elt = pat->element (1); if (INSN_FROM_TARGET_P (elt)) { @@ -2478,7 +2477,7 @@ scan_trace (dw_trace_info *trace) for (i = 1; i < n; ++i) { - elt = XVECEXP (pat, 0, i); + elt = pat->element (i); scan_insn_after (elt); } -- 1.7.11.7