From patchwork Wed Aug 6 17:20:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 377267 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 0B2B7140080 for ; Thu, 7 Aug 2014 04:08:06 +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=TSXNkYKc9zpF+3Hsi2bvwIL5tWSg954AkbWIkdlmEDQ27tSgs2YCr nSO8RorJ17vBjBWaaxPowxo3FVzkGoNWRWigVI543SS8PAktOlfZiFSoqS4fwJmo zlir0Tg4xW5+65Gp5o1uv7wxP7ciFO10YE1LqSqsdlqrgH+JAzkQtc= 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=AACICuVTm/4At/0hH2MFhQECvhg=; b=o7P8hmJGgipKOfEuxlIW TicLc5EqLL0XPVsYQ+X/5x/370t+dB3dHsf5DDi1pLyQGZsBBtjvSkMjl3Vin+7T EBvXb65ZmvdBEv/jWX4IBbwX0aMQgoMbQvcDd8N4Xc9+1UO5YSCidzAJMLNeru0r /WUB8j09OtXRheo0f24kZMk= Received: (qmail 28099 invoked by alias); 6 Aug 2014 17:43:51 -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 28023 invoked by uid 89); 6 Aug 2014 17:43:50 -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:43:49 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF4t1-0000uL-Gl for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF4t1-0000u8-4w for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:27 -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 s76HJPFl008099 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:19:26 -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 s76HJ2oF030913; Wed, 6 Aug 2014 13:19:25 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 039/236] create_insn_rtx_from_pattern and create_copy_of_insn_rtx return rtx_insn Date: Wed, 6 Aug 2014 13:20:18 -0400 Message-Id: <1407345815-14551-40-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/ * sel-sched-ir.h (create_insn_rtx_from_pattern): Strengthen return type from rtx to rtx_insn *. * sel-sched-ir.h (create_copy_of_insn_rtx): Likewise. * sel-sched-ir.c (create_insn_rtx_from_pattern): Likewise. * sel-sched-ir.c (create_copy_of_insn_rtx): Likewise, also for local "res". --- gcc/sel-sched-ir.c | 9 +++++---- gcc/sel-sched-ir.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index 43569ee..f51f4f3 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -5724,10 +5724,10 @@ sel_unregister_cfg_hooks (void) /* Emit an insn rtx based on PATTERN. If a jump insn is wanted, LABEL is where this jump should be directed. */ -rtx +rtx_insn * create_insn_rtx_from_pattern (rtx pattern, rtx label) { - rtx insn_rtx; + rtx_insn *insn_rtx; gcc_assert (!INSN_P (pattern)); @@ -5767,10 +5767,11 @@ create_vinsn_from_insn_rtx (rtx insn_rtx, bool force_unique_p) } /* Create a copy of INSN_RTX. */ -rtx +rtx_insn * create_copy_of_insn_rtx (rtx insn_rtx) { - rtx res, link; + rtx_insn *res; + rtx link; if (DEBUG_INSN_P (insn_rtx)) return create_insn_rtx_from_pattern (copy_rtx (PATTERN (insn_rtx)), diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index 16e7806..d2bf7e2 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -1629,9 +1629,9 @@ extern void sel_register_cfg_hooks (void); extern void sel_unregister_cfg_hooks (void); /* Expression transformation routines. */ -extern rtx create_insn_rtx_from_pattern (rtx, rtx); +extern rtx_insn *create_insn_rtx_from_pattern (rtx, rtx); extern vinsn_t create_vinsn_from_insn_rtx (rtx, bool); -extern rtx create_copy_of_insn_rtx (rtx); +extern rtx_insn *create_copy_of_insn_rtx (rtx); extern void change_vinsn_in_expr (expr_t, vinsn_t); /* Various initialization functions. */