From patchwork Mon Nov 14 08:09:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tbsaunde+gcc@tbsaunde.org X-Patchwork-Id: 694405 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 3tHNMm2Z8Zz9t0X for ; Mon, 14 Nov 2016 19:04:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="kGCSmDZ8"; dkim-atps=neutral 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:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=nn0I8pHwfGFh8mHpFzLTBsseiSid/hjBih+41g/YpuYvOohWINYib XfN/Xzfor2VrAz7QT+cabrSLh0A4F76T6k5VeGErMlN3jMF4L3cyrctZeQvWmxMZ xJmMgGaLEXJwF4UAv3tEIDIOs/eJiEhyIBB/oDpLD0ZB7mklZ2Yy+o= 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:subject:date:message-id:in-reply-to:references; s=default; bh=AKT6+TeiQvfgmUF1NoRvojhJrT8=; b=kGCSmDZ8AYEitV6FNGsjF6KiMLYS 8tM3aUC7fcS+H3nUAbozPLiLqJtT3eEd7vKjcDpS0kKjHP+3jEgiI1aRTVNiUewY vUSF5MZqoPhv8M9285cSGyJwZjunlzgAn103Xw7C+BcGnwKcSM9hmiItbRCz6/QF PWdRpWVwafsrDg4= Received: (qmail 16364 invoked by alias); 14 Nov 2016 08:01:56 -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 16260 invoked by uid 89); 14 Nov 2016 08:01:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_FAIL autolearn=no version=3.3.2 spammy=1427, 142, 7, 2016-11-14 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 ESMTP; Mon, 14 Nov 2016 08:01:45 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6CCl-0006g7-CR for gcc-patches@gcc.gnu.org; Mon, 14 Nov 2016 03:01:28 -0500 Received: from [2600:3c03::f03c:91ff:fe6e:c625] (port=48156 helo=paperclip.tbsaunde.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6CCl-0006ff-7O for gcc-patches@gcc.gnu.org; Mon, 14 Nov 2016 03:01:27 -0500 Received: from keg.corp.tor1.mozilla.com (unknown [IPv6:2607:f0c8:8000:80e0:56ee:75ff:fe52:afb9]) by paperclip.tbsaunde.org (Postfix) with ESMTPSA id 54906C1AD for ; Mon, 14 Nov 2016 08:01:26 +0000 (UTC) From: tbsaunde+gcc@tbsaunde.org To: gcc-patches@gcc.gnu.org Subject: [PATCH 08/11] make prologue_epilogue_contains take a rtx_insn * Date: Mon, 14 Nov 2016 03:09:31 -0500 Message-Id: <20161114080934.19056-9-tbsaunde+gcc@tbsaunde.org> In-Reply-To: <20161114080934.19056-1-tbsaunde+gcc@tbsaunde.org> References: <20161114080934.19056-1-tbsaunde+gcc@tbsaunde.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2600:3c03::f03c:91ff:fe6e:c625 X-IsSubscribed: yes From: Trevor Saunders gcc/ChangeLog: 2016-11-14 Trevor Saunders * function.c (contains): Change argument type to rtx_insn *. (prologue_contains): Likewise. (epilogue_contains): Likewise. (prologue_epilogue_contains): Likewise. * function.h: Adjust prototype. --- gcc/function.c | 12 ++++++------ gcc/function.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/function.c b/gcc/function.c index 0b1d168..ab76a26 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -142,7 +142,7 @@ extern tree debug_find_var_in_block_tree (tree, tree); can always export `prologue_epilogue_contains'. */ static void record_insns (rtx_insn *, rtx, hash_table **) ATTRIBUTE_UNUSED; -static bool contains (const_rtx, hash_table *); +static bool contains (const rtx_insn *, hash_table *); static void prepare_function_start (void); static void do_clobber_return_reg (rtx, void *); static void do_use_return_reg (rtx, void *); @@ -5733,7 +5733,7 @@ maybe_copy_prologue_epilogue_insn (rtx insn, rtx copy) we can be running after reorg, SEQUENCE rtl is possible. */ static bool -contains (const_rtx insn, hash_table *hash) +contains (const rtx_insn *insn, hash_table *hash) { if (hash == NULL) return false; @@ -5748,23 +5748,23 @@ contains (const_rtx insn, hash_table *hash) return false; } - return hash->find (const_cast (insn)) != NULL; + return hash->find (const_cast (insn)) != NULL; } int -prologue_contains (const_rtx insn) +prologue_contains (const rtx_insn *insn) { return contains (insn, prologue_insn_hash); } int -epilogue_contains (const_rtx insn) +epilogue_contains (const rtx_insn *insn) { return contains (insn, epilogue_insn_hash); } int -prologue_epilogue_contains (const_rtx insn) +prologue_epilogue_contains (const rtx_insn *insn) { if (contains (insn, prologue_insn_hash)) return 1; diff --git a/gcc/function.h b/gcc/function.h index e854c7f..163ad0c 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -628,9 +628,9 @@ extern void clobber_return_register (void); extern void expand_function_end (void); extern rtx get_arg_pointer_save_area (void); extern void maybe_copy_prologue_epilogue_insn (rtx, rtx); -extern int prologue_contains (const_rtx); -extern int epilogue_contains (const_rtx); -extern int prologue_epilogue_contains (const_rtx); +extern int prologue_contains (const rtx_insn *); +extern int epilogue_contains (const rtx_insn *); +extern int prologue_epilogue_contains (const rtx_insn *); extern void record_prologue_seq (rtx_insn *); extern void record_epilogue_seq (rtx_insn *); extern void emit_return_into_block (bool simple_p, basic_block bb);