From patchwork Mon Feb 23 13:56:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 442530 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 6D62614016B for ; Tue, 24 Feb 2015 00:56:57 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=AAeWZDheWrnJWD7PNR7VwuSMJfyLEpd2k8GEmNTKdvfyXgOid2 vXe1oYDvIVsKoxRtSnnFY8mzqXV3jw5JbZ1uYCm5e1aLjipTiDzOzL+o87JhDBdU A2ZXJGtWxMuxjzk1VYRVpPQkJ0SlTlQ/xdyb7FISSYZwaXzn7BEMMJlMU= 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:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=s17eW3eYORodx1tVCpZFThfp2LU=; b=VquJXyjLb0sEBL40cm3r 2fppRPxrxA7RcoRvMEFVDKqCqx+QyXQ98rNYXQKxZpcElyc8dwjIePSlefC0cMpV pKszoTksZ6IgPhgmLOQvDJEKU9CFE9cMKI0xbH0XKfgmpulhxl9u8S1YiV/QXlZ5 semHe4c3Ig+yLhJwW8IR2EM= Received: (qmail 12145 invoked by alias); 23 Feb 2015 13:56:50 -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 12128 invoked by uid 89); 23 Feb 2015 13:56:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KAM_FROM_URIBL_PCCC, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-pa0-f42.google.com Received: from mail-pa0-f42.google.com (HELO mail-pa0-f42.google.com) (209.85.220.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Mon, 23 Feb 2015 13:56:47 +0000 Received: by pabkq14 with SMTP id kq14so27731752pab.3 for ; Mon, 23 Feb 2015 05:56:46 -0800 (PST) X-Received: by 10.68.125.197 with SMTP id ms5mr19781050pbb.12.1424699806011; Mon, 23 Feb 2015 05:56:46 -0800 (PST) Received: from bubble.grove.modra.org ([58.160.155.134]) by mx.google.com with ESMTPSA id f3sm34664574pdn.89.2015.02.23.05.56.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Feb 2015 05:56:45 -0800 (PST) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id B3D92EA0137; Tue, 24 Feb 2015 00:26:39 +1030 (ACDT) Date: Tue, 24 Feb 2015 00:26:39 +1030 From: Alan Modra To: gcc-patches@gcc.gnu.org Cc: David Edelsohn Subject: [RS6000] Fix rtl checking ICE building libjava Message-ID: <20150223135639.GL11515@bubble.grove.modra.org> Mail-Followup-To: gcc-patches@gcc.gnu.org, David Edelsohn MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes get_memreg_parts can return a memory base other than a REG, when the memory address in question is a PLUS with other than a REG as its first operand. This leads to an ICE with rtl checking enabled on the following, since the callers of get_memreg_parts expect a REG. (gdb) p debug_rtx(addr_rtx) (plus:DI (plus:DI (reg/f:DI 9 9 [162]) (const_int 65536 [0x10000])) (const_int -31752 [0xffffffffffff83f8])) Bootstrapped and regression tested powerpc64-linux. OK for stage4? PR target/65182 * config/rs6000/rs6000.c (get_memref_parts): Only return true when *base is a reg. Handle nested plus addresses. Simplify pre_modify test. Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 220902) +++ gcc/config/rs6000/rs6000.c (working copy) @@ -27172,25 +27172,21 @@ get_memref_parts (rtx mem, rtx *base, HOST_WIDE_IN else return false; - if (GET_CODE (XEXP (mem, 0)) == PRE_MODIFY) - addr_rtx = XEXP (XEXP (mem, 0), 1); - else - addr_rtx = (XEXP (mem, 0)); + addr_rtx = (XEXP (mem, 0)); + if (GET_CODE (addr_rtx) == PRE_MODIFY) + addr_rtx = XEXP (addr_rtx, 1); - if (GET_CODE (addr_rtx) == REG) + *offset = 0; + while (GET_CODE (addr_rtx) == PLUS + && CONST_INT_P (XEXP (addr_rtx, 1))) { - *base = addr_rtx; - *offset = 0; + *offset += INTVAL (XEXP (addr_rtx, 1)); + addr_rtx = XEXP (addr_rtx, 0); } - else if (GET_CODE (addr_rtx) == PLUS - && CONST_INT_P (XEXP (addr_rtx, 1))) - { - *base = XEXP (addr_rtx, 0); - *offset = INTVAL (XEXP (addr_rtx, 1)); - } - else + if (!REG_P (addr_rtx)) return false; + *base = addr_rtx; return true; }