From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13314 invoked by alias); 6 Aug 2014 17:21:56 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 10764 invoked by uid 89); 6 Aug 2014 17:21:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 06 Aug 2014 17:21:32 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s76HL0id029297 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:21:00 -0400 Received: from c64.redhat.com (vpn-239-139.phx2.redhat.com [10.3.239.139]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s76HJ2qw030913; Wed, 6 Aug 2014 13:20:59 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 202/236] dwarf2cfi.c: Use rtx_sequence Date: Wed, 06 Aug 2014 17:21:00 -0000 Message-Id: <1407345815-14551-203-git-send-email-dmalcolm@redhat.com> In-Reply-To: <1407345815-14551-1-git-send-email-dmalcolm@redhat.com> References: <1407345815-14551-1-git-send-email-dmalcolm@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg00561.txt.bz2 gcc/ * dwarf2cfi.c (create_trace_edges): Convert GET_CODE check into a dyn_cast, strengthening local "seq" from rtx to rtx_sequence *. Use methods of rtx_sequence. (scan_trace): Likewise for local "pat". --- gcc/dwarf2cfi.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index bcfc9dd..38c60d0 100644 --- a/gcc/dwarf2cfi.c +++ b/gcc/dwarf2cfi.c @@ -2341,12 +2341,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 = dyn_cast (PATTERN (insn))) { - 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->insn (i)); return; } @@ -2421,12 +2420,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 = dyn_cast (PATTERN (insn))) { - 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 (); @@ -2438,7 +2437,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)) { @@ -2493,7 +2492,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.8.5.3