From patchwork Fri Jun 25 14:33:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 56915 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]) by ozlabs.org (Postfix) with SMTP id A6A94B6EDF for ; Sat, 26 Jun 2010 00:33:41 +1000 (EST) Received: (qmail 11099 invoked by alias); 25 Jun 2010 14:33:39 -0000 Received: (qmail 11088 invoked by uid 22791); 25 Jun 2010 14:33:38 -0000 X-SWARE-Spam-Status: No, hits=-5.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from cantor.suse.de (HELO mx1.suse.de) (195.135.220.2) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 25 Jun 2010 14:33:29 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 0090990847 for ; Fri, 25 Jun 2010 16:33:27 +0200 (CEST) Date: Fri, 25 Jun 2010 16:33:26 +0200 (CEST) From: Richard Guenther To: gcc-patches@gcc.gnu.org Subject: [PATCH][mem-ref2] Revert expand_debug_expr change Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 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 This reverts the other odd change noticed. This was probably fixed by the inliner fixes. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied. Richard. 2010-06-25 Richard Guenther * cfgexpand.c (expand_debug_expr): Revert change. Index: gcc/cfgexpand.c =================================================================== --- gcc/cfgexpand.c (revision 161369) +++ gcc/cfgexpand.c (working copy) @@ -2504,31 +2504,10 @@ expand_debug_expr (tree exp) HOST_WIDE_INT bitsize, bitpos; tree offset; int volatilep = 0; - tree *tp = &exp; - tree tem; + tree tem = get_inner_reference (exp, &bitsize, &bitpos, &offset, + &mode1, &unsignedp, &volatilep, false); rtx orig_op0; - /* First fold un-folded results from CCP. */ - do - { - while (handled_component_p (*tp)) - tp = &TREE_OPERAND (*tp, 0); - if (TREE_CODE (*tp) == MEM_REF) - { - tem = fold_binary (MEM_REF, TREE_TYPE (*tp), - TREE_OPERAND (*tp, 0), - TREE_OPERAND (*tp, 1)); - if (!tem) - break; - *tp = tem; - } - else - break; - } - while (1); - - tem = get_inner_reference (exp, &bitsize, &bitpos, &offset, - &mode1, &unsignedp, &volatilep, false); if (bitsize == 0) return NULL;