From patchwork Sat May 9 04:08:03 2015 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: 470251 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 75C2F1401AD for ; Sat, 9 May 2015 14:10:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Zhjl5m8m; 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=aqAnMRZEgjCtaAfJgcLFhz0/t0Qi55U7bPaermQFAnlrtETGgNPe/ o6Wd9yDSKRWnF6MG9IHvWLkM8J9q9qIsA3x0FbLKdvqxYqjoYOVxAFsYhQMSROtt E5IXMepXNekWw9KL9rjADFn8wEHZ+kYAowoLDogz/JhLBL+pG/59e4= 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=8pOPPGZ5Dw7BEw/uiS163eKHyZI=; b=Zhjl5m8mVkAkBpmeXog1rkA38F7j orrsxuhmZEg69Pfs9ms4jrT/o0noz26xfv3UBsK8tsGUSx+CjpKFqpg/eQafHJPA 4Zt+BhZkO3SNeZyO+rGH8lV6VbVXwluYCDDiYCM/3ARZV8S998fOZ9s9vd0wZaiv WfEXJPO8f+sBBas= Received: (qmail 58754 invoked by alias); 9 May 2015 04:09:01 -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 58686 invoked by uid 89); 9 May 2015 04:09:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.8 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY autolearn=no 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; Sat, 09 May 2015 04:08:59 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yqw4M-00008K-Ly for gcc-patches@gcc.gnu.org; Sat, 09 May 2015 00:08:57 -0400 Received: from tbsaunde.org ([66.228.47.254]:44975 helo=paperclip.tbsaunde.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yqw4M-00007y-IM for gcc-patches@gcc.gnu.org; Sat, 09 May 2015 00:08:54 -0400 Received: from iceball.corp.tor1.mozilla.com (unknown [66.207.208.102]) by paperclip.tbsaunde.org (Postfix) with ESMTPSA id 0BDFDC072 for ; Sat, 9 May 2015 04:08:52 +0000 (UTC) From: tbsaunde+gcc@tbsaunde.org To: gcc-patches@gcc.gnu.org Subject: [PATCH 04/25] change in_expr_list_p to in_insn_list_p Date: Sat, 9 May 2015 00:08:03 -0400 Message-Id: <1431144504-23213-5-git-send-email-tbsaunde+gcc@tbsaunde.org> In-Reply-To: <1431144504-23213-1-git-send-email-tbsaunde+gcc@tbsaunde.org> References: <1431144504-23213-1-git-send-email-tbsaunde+gcc@tbsaunde.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.228.47.254 X-IsSubscribed: yes From: Trevor Saunders gcc/ChangeLog: 2015-05-08 Trevor Saunders * rtlanal.c (in_insn_list_p): Renamed from in_expr_list_p. * cfgrtl.c (can_delete_label_p): Adjust. * rtl.h: likewise. --- gcc/ChangeLog | 6 ++++++ gcc/cfgrtl.c | 2 +- gcc/rtl.h | 2 +- gcc/rtlanal.c | 8 ++++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f4b88d3..94783f8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2015-05-08 Trevor Saunders + * rtlanal.c (in_insn_list_p): Renamed from in_expr_list_p. + * cfgrtl.c (can_delete_label_p): Adjust. + * rtl.h: likewise. + +2015-05-08 Trevor Saunders + * reorg.c (stop_search_p): Change argument to rtx_insn *. 2015-05-08 Trevor Saunders diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 8a75044..390d718 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -145,7 +145,7 @@ can_delete_label_p (const rtx_code_label *label) return (!LABEL_PRESERVE_P (label) /* User declared labels must be preserved. */ && LABEL_NAME (label) == 0 - && !in_expr_list_p (forced_labels, label)); + && !in_insn_list_p (forced_labels, label)); } /* Delete INSN by patching it out. */ diff --git a/gcc/rtl.h b/gcc/rtl.h index 273e2d5..6b01dd7 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -2922,7 +2922,7 @@ extern unsigned hash_rtx_cb (const_rtx, machine_mode, int *, int *, extern rtx regno_use_in (unsigned int, rtx); extern int auto_inc_p (const_rtx); -extern int in_expr_list_p (const_rtx, const_rtx); +extern bool in_insn_list_p (const rtx_insn_list *, const rtx_insn *); extern void remove_node_from_expr_list (const_rtx, rtx_expr_list **); extern void remove_node_from_insn_list (const rtx_insn *, rtx_insn_list **); extern int loc_mentioned_in_p (rtx *, const_rtx); diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index 2377f25a..b531010 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -2205,16 +2205,16 @@ remove_reg_equal_equiv_notes_for_regno (unsigned int regno) return 1 if it is found. A simple equality test is used to determine if NODE matches. */ -int -in_expr_list_p (const_rtx listp, const_rtx node) +bool +in_insn_list_p (const rtx_insn_list *listp, const rtx_insn *node) { const_rtx x; for (x = listp; x; x = XEXP (x, 1)) if (node == XEXP (x, 0)) - return 1; + return true; - return 0; + return false; } /* Search LISTP (an EXPR_LIST) for an entry whose first operand is NODE and