From patchwork Sun Aug 3 14:15:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 376041 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 2F7C41400AA for ; Mon, 4 Aug 2014 00:16:02 +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:subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=default; b=nQknTF3jsjzB218hUBAszDYIJfGqD 6tAA2+qJdoBPCbFr4UU1giWHXvAidGlAFjePm7T9PSLigoGNJBZs0yulH8CWh+ak 61x1JGnxgrXLycc7h3xvwqynFNUFN5h8ekUGwPf/OG6tDEnyVHPQXrs6dZPqAzYn qiWUFmxNOGnrQk= 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:references:date:in-reply-to:message-id:mime-version :content-type; s=default; bh=pCFmQ9txmJDF0Es9o33eRiWucfc=; b=ER9 oWh5ezIk9+2Cu6vdZHIETglDOO2jVRcCw6kBRWvXlc8x5s8pyjTyZOI4mQofftQm xJa80LUg7niUjkT/UmwHxv5ZsnYaf5K1SCdYuWudHlekWdFbvngSbO7P3uct8gQI rSt7zt7LH4+CtBMt0+NJ8r2JlP8Lp9zEwarDJGJ4= Received: (qmail 25787 invoked by alias); 3 Aug 2014 14:15: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 25774 invoked by uid 89); 3 Aug 2014 14:15:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f174.google.com Received: from mail-we0-f174.google.com (HELO mail-we0-f174.google.com) (74.125.82.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sun, 03 Aug 2014 14:15:54 +0000 Received: by mail-we0-f174.google.com with SMTP id x48so6464115wes.19 for ; Sun, 03 Aug 2014 07:15:51 -0700 (PDT) X-Received: by 10.180.85.162 with SMTP id i2mr22503981wiz.53.1407075351484; Sun, 03 Aug 2014 07:15:51 -0700 (PDT) Received: from localhost ([95.145.138.172]) by mx.google.com with ESMTPSA id ey16sm30296677wid.14.2014.08.03.07.15.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Aug 2014 07:15:51 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [PATCH 31/50] lower-subreg.c:resolve_debug References: <87y4v5d77q.fsf@googlemail.com> Date: Sun, 03 Aug 2014 15:15:50 +0100 In-Reply-To: <87y4v5d77q.fsf@googlemail.com> (Richard Sandiford's message of "Sun, 03 Aug 2014 14:38:01 +0100") Message-ID: <878un58xrd.fsf@googlemail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 gcc/ * lower-subreg.c (adjust_decomposed_uses): Delete. (resolve_debug): Use FOR_EACH_SUBRTX_PTR rather than for_each_rtx. Remove handling of null rtxes. Index: gcc/lower-subreg.c =================================================================== --- gcc/lower-subreg.c 2014-08-03 11:25:28.502137966 +0100 +++ gcc/lower-subreg.c 2014-08-03 11:25:28.779140704 +0100 @@ -765,34 +765,6 @@ resolve_subreg_use (rtx *loc, rtx insn) return false; } -/* This is called via for_each_rtx. Look for SUBREGs which can be - decomposed and decomposed REGs that need copying. */ - -static int -adjust_decomposed_uses (rtx *px, void *data ATTRIBUTE_UNUSED) -{ - rtx x = *px; - - if (x == NULL_RTX) - return 0; - - if (resolve_subreg_p (x)) - { - x = simplify_subreg_concatn (GET_MODE (x), SUBREG_REG (x), - SUBREG_BYTE (x)); - - if (x) - *px = x; - else - x = copy_rtx (*px); - } - - if (resolve_reg_p (x)) - *px = copy_rtx (x); - - return 0; -} - /* Resolve any decomposed registers which appear in register notes on INSN. */ @@ -1164,7 +1136,24 @@ resolve_use (rtx pat, rtx insn) static void resolve_debug (rtx insn) { - for_each_rtx (&PATTERN (insn), adjust_decomposed_uses, NULL_RTX); + subrtx_ptr_iterator::array_type array; + FOR_EACH_SUBRTX_PTR (iter, array, &PATTERN (insn), NONCONST) + { + rtx *loc = *iter; + rtx x = *loc; + if (resolve_subreg_p (x)) + { + x = simplify_subreg_concatn (GET_MODE (x), SUBREG_REG (x), + SUBREG_BYTE (x)); + + if (x) + *loc = x; + else + x = copy_rtx (*loc); + } + if (resolve_reg_p (x)) + *loc = copy_rtx (x); + } df_insn_rescan (insn);