From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22204 invoked by alias); 6 Aug 2014 17:42:45 -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 22145 invoked by uid 89); 6 Aug 2014 17:42:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.2 X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 06 Aug 2014 17:42:44 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF4sz-0000tH-1K for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF4sy-0000t4-Oy for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:24 -0400 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 s76HJNfS005393 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:19:24 -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 s76HJ2oB030913; Wed, 6 Aug 2014 13:19:23 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 035/236] Return types of unlink_insn_chain and duplicate_insn_chain Date: Wed, 06 Aug 2014 17:43:00 -0000 Message-Id: <1407345815-14551-36-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-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg00659.txt.bz2 gcc/ * rtl.h (unlink_insn_chain): Strengthen return type from rtx to rtx_insn *. (duplicate_insn_chain): Likewise. * cfgrtl.c (unlink_insn_chain): Strengthen return type from rtx to rtx_insn *, also for locals "prevfirst" and "nextlast". Add a checked cast for now (until we can strengthen the params in the same way). (duplicate_insn_chain): Likewise. --- gcc/cfgrtl.c | 12 ++++++------ gcc/rtl.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 9f15a7d..5611ab8 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -3304,11 +3304,11 @@ fixup_abnormal_edges (void) /* Cut the insns from FIRST to LAST out of the insns stream. */ -rtx +rtx_insn * unlink_insn_chain (rtx first, rtx last) { - rtx prevfirst = PREV_INSN (first); - rtx nextlast = NEXT_INSN (last); + rtx_insn *prevfirst = PREV_INSN (first); + rtx_insn *nextlast = NEXT_INSN (last); SET_PREV_INSN (first) = NULL; SET_NEXT_INSN (last) = NULL; @@ -3320,7 +3320,7 @@ unlink_insn_chain (rtx first, rtx last) set_last_insn (prevfirst); if (!prevfirst) set_first_insn (nextlast); - return first; + return as_a (first); } /* Skip over inter-block insns occurring after BB which are typically @@ -4083,7 +4083,7 @@ cfg_layout_can_duplicate_bb_p (const_basic_block bb) return true; } -rtx +rtx_insn * duplicate_insn_chain (rtx from, rtx to) { rtx insn, next, copy; @@ -4169,7 +4169,7 @@ duplicate_insn_chain (rtx from, rtx to) } insn = NEXT_INSN (last); delete_insn (last); - return insn; + return as_a (insn); } /* Create a duplicate of the basic block BB. */ diff --git a/gcc/rtl.h b/gcc/rtl.h index b4027aa..2cce7d4 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -3072,7 +3072,7 @@ extern void delete_insn (rtx); extern rtx_insn *entry_of_function (void); extern void emit_insn_at_entry (rtx); extern void delete_insn_chain (rtx, rtx, bool); -extern rtx unlink_insn_chain (rtx, rtx); +extern rtx_insn *unlink_insn_chain (rtx, rtx); extern void delete_insn_and_edges (rtx); extern rtx gen_lowpart_SUBREG (enum machine_mode, rtx); extern rtx gen_const_mem (enum machine_mode, rtx); @@ -3148,7 +3148,7 @@ extern int fixup_args_size_notes (rtx, rtx, int); /* In cfgrtl.c */ extern void print_rtl_with_bb (FILE *, const_rtx, int); -extern rtx duplicate_insn_chain (rtx, rtx); +extern rtx_insn *duplicate_insn_chain (rtx, rtx); /* In expmed.c */ extern void init_expmed (void); -- 1.8.5.3