From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31970 invoked by alias); 6 Aug 2014 17:38:22 -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 31921 invoked by uid 89); 6 Aug 2014 17:38:21 -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:38:20 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF4st-0000s2-3d for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF4ss-0000ry-Qv for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:19 -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 s76HJISv012216 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:19:18 -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 s76HJ2o2030913; Wed, 6 Aug 2014 13:19:17 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 026/236] bb_note returns a rtx_note * Date: Wed, 06 Aug 2014 17:38:00 -0000 Message-Id: <1407345815-14551-27-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/msg00597.txt.bz2 gcc/ * basic-block.h (bb_note): Strengthen return type from rtx to rtx_note *. * sched-int.h (bb_note): Likewise. * cfgrtl.c (bb_note): Likewise. Add a checked cast to rtx_note *. --- gcc/basic-block.h | 2 +- gcc/cfgrtl.c | 4 ++-- gcc/sched-int.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 82dbfe9..87094c6 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -798,7 +798,7 @@ extern basic_block * single_pred_before_succ_order (void); /* In cfgrtl.c */ extern rtx block_label (basic_block); -extern rtx bb_note (basic_block); +extern rtx_note *bb_note (basic_block); extern bool purge_all_dead_edges (void); extern bool purge_dead_edges (basic_block); extern bool fixup_abnormal_edges (void); diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 168a44a..ac3bc87 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -662,7 +662,7 @@ could_fall_through (basic_block src, basic_block target) } /* Return the NOTE_INSN_BASIC_BLOCK of BB. */ -rtx +rtx_note * bb_note (basic_block bb) { rtx note; @@ -672,7 +672,7 @@ bb_note (basic_block bb) note = NEXT_INSN (note); gcc_assert (NOTE_INSN_BASIC_BLOCK_P (note)); - return note; + return as_a (note); } /* Return the INSN immediately following the NOTE_INSN_BASIC_BLOCK diff --git a/gcc/sched-int.h b/gcc/sched-int.h index 3680889..7f236a1 100644 --- a/gcc/sched-int.h +++ b/gcc/sched-int.h @@ -1368,7 +1368,7 @@ extern void sched_change_pattern (rtx, rtx); extern int sched_speculate_insn (rtx, ds_t, rtx *); extern void unlink_bb_notes (basic_block, basic_block); extern void add_block (basic_block, basic_block); -extern rtx bb_note (basic_block); +extern rtx_note *bb_note (basic_block); extern void concat_note_lists (rtx, rtx *); extern rtx sched_emit_insn (rtx); extern rtx get_ready_element (int); -- 1.8.5.3