From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29748 invoked by alias); 6 Aug 2014 17:19:30 -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 29250 invoked by uid 89); 6 Aug 2014 17:19:27 -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,SPF_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:19:26 +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 s76HJN13008063 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:19:23 -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 s76HJ2oA030913; Wed, 6 Aug 2014 13:19:22 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 034/236] next_cc0_user and prev_cc0_setter scaffolding Date: Wed, 06 Aug 2014 17:19:00 -0000 Message-Id: <1407345815-14551-35-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/msg00499.txt.bz2 gcc/ * rtl.h (next_cc0_user): Strengthen return type from rtx to rtx_insn *. (prev_cc0_setter): Likewise. * emit-rtl.c (next_cc0_user): Strengthen return type from rtx to rtx_insn *, adding checked casts for now as necessary. (prev_cc0_setter): Likewise. --- gcc/emit-rtl.c | 12 ++++++------ gcc/rtl.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 042694a..b64b276 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -3437,20 +3437,20 @@ prev_active_insn (rtx insn) Return 0 if we can't find the insn. */ -rtx +rtx_insn * next_cc0_user (rtx insn) { rtx note = find_reg_note (insn, REG_CC_USER, NULL_RTX); if (note) - return XEXP (note, 0); + return as_a_nullable (XEXP (note, 0)); insn = next_nonnote_insn (insn); if (insn && NONJUMP_INSN_P (insn) && GET_CODE (PATTERN (insn)) == SEQUENCE) insn = XVECEXP (PATTERN (insn), 0, 0); if (insn && INSN_P (insn) && reg_mentioned_p (cc0_rtx, PATTERN (insn))) - return insn; + return as_a_nullable (insn); return 0; } @@ -3458,18 +3458,18 @@ next_cc0_user (rtx insn) /* Find the insn that set CC0 for INSN. Unless INSN has a REG_CC_SETTER note, it is the previous insn. */ -rtx +rtx_insn * prev_cc0_setter (rtx insn) { rtx note = find_reg_note (insn, REG_CC_SETTER, NULL_RTX); if (note) - return XEXP (note, 0); + return as_a_nullable (XEXP (note, 0)); insn = prev_nonnote_insn (insn); gcc_assert (sets_cc0_p (PATTERN (insn))); - return insn; + return as_a_nullable (insn); } #endif diff --git a/gcc/rtl.h b/gcc/rtl.h index d519908..b4027aa 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -2418,8 +2418,8 @@ extern rtx_insn *next_real_insn (rtx); extern rtx_insn *prev_active_insn (rtx); extern rtx_insn *next_active_insn (rtx); extern int active_insn_p (const_rtx); -extern rtx next_cc0_user (rtx); -extern rtx prev_cc0_setter (rtx); +extern rtx_insn *next_cc0_user (rtx); +extern rtx_insn *prev_cc0_setter (rtx); /* In emit-rtl.c */ extern int insn_line (const_rtx); -- 1.8.5.3