From patchwork Wed Aug 6 17:20:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 377229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EB1A1140086 for ; Thu, 7 Aug 2014 03:58:16 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=UeNERwU/7Je6lKTbNmdYA3TKkJkvdj+UWpiFTf/WxKefgcvnWi+yF hSz95C5vO0EopT1ZZDt8xUGXJwckiqrO4Iw2OLaC7goEMAz4D6yvvA5yvY97cSP8 v6RACuYWJNPuWdYdHd08Gbo9hPP3Ds4cjniweiC4ib4eO9mLDkIWV8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=c5OQ0IXJGEf6O3avy0ArDyQWocY=; b=EpIC9436NE+KSjFqKnP6 JPxqKmzUq9wErEZU1iBWU7aX2fU8yRmM86eSslpMQUiTnIJnNjuEmXKD4x/k0pcX t6RtNd62GPgU0VesYUS8ODAUc3QkiqA7uVeyQqGPmnKXfcVHjXllIY5MD7MjXXDH C0kZ51jiODA6ZP1RqFeZFZw= Received: (qmail 17637 invoked by alias); 6 Aug 2014 17:42:04 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 17605 invoked by uid 89); 6 Aug 2014 17:42:04 -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:03 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF4sy-0000t9-UX for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF4sy-0000t1-NJ 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 s76HJONl008079 (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 s76HJ2oC030913; Wed, 6 Aug 2014 13:19:23 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 036/236] get_last_bb_insn returns an rtx_insn Date: Wed, 6 Aug 2014 13:20:15 -0400 Message-Id: <1407345815-14551-37-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 gcc/ * basic-block.h (get_last_bb_insn): Strengthen return type from rtx to rtx_insn *. * cfgrtl.c (get_last_bb_insn): Likewise, and for locals "tmp" and end". --- gcc/basic-block.h | 2 +- gcc/cfgrtl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 03dbdbc..2eb6553 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -828,7 +828,7 @@ extern bool delete_unreachable_blocks (void); extern void update_br_prob_note (basic_block); extern bool inside_basic_block_p (const_rtx); extern bool control_flow_insn_p (const_rtx); -extern rtx get_last_bb_insn (basic_block); +extern rtx_insn *get_last_bb_insn (basic_block); /* In dominance.c */ diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 5611ab8..e3bad95 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -2238,12 +2238,12 @@ update_br_prob_note (basic_block bb) /* Get the last insn associated with block BB (that includes barriers and tablejumps after BB). */ -rtx +rtx_insn * get_last_bb_insn (basic_block bb) { rtx_jump_table_data *table; - rtx tmp; - rtx end = BB_END (bb); + rtx_insn *tmp; + rtx_insn *end = BB_END (bb); /* Include any jump table following the basic block. */ if (tablejump_p (end, NULL, &table))