From patchwork Fri Mar 22 22:58:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dehao Chen X-Patchwork-Id: 230290 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 598D82C00A7 for ; Sat, 23 Mar 2013 09:58:42 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=NViTXtsVNwVocreUHz dBK4wSWBHWpJyKDwR1nwI7dlPH8odgWE8r46AZ24qNiXviADWYSGsFRXUKExjTSD U8lANK82aLk0/yKv7tR5BpZW/BEQjoMTDC8aeYYnmZXzuS1LTzTFuQTTgoYl4vtj keQ9NGrlt+KhJo3ZcHnF19DsA= 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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=pKl8/PnBhdW5GqB7AmYqizqL jGU=; b=hyLfX6xqyD3Sk9DyqUJqXPWPD4MkRPzLPfLZY9gJqrztLzaIPdynJgp6 qgX5H2VmwxRvqww69nQKUpg+48bngfg0wF6opy7GdyeevwE2Px01je4/OW0ArMxU alehTD75tquuPFRs2bMb0jPCBI514XAGD8e4d32+FgqQBFPNtHw= Received: (qmail 3180 invoked by alias); 22 Mar 2013 22:58:33 -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 3144 invoked by uid 89); 22 Mar 2013 22:58:26 -0000 X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD autolearn=ham version=3.3.1 Received: from mail-ee0-f53.google.com (HELO mail-ee0-f53.google.com) (74.125.83.53) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 22 Mar 2013 22:58:24 +0000 Received: by mail-ee0-f53.google.com with SMTP id e53so2521818eek.40 for ; Fri, 22 Mar 2013 15:58:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type:x-gm-message-state; bh=iqxECf6lJR9xn7Azxe8360QcUyV5xXgNGeg2FuSUfkU=; b=a9byyo8SEPIlax2rM7/JzoYaxQuMWOunkyiQFYKqJx+cmLaKo1ZrIMAyZI7n4rKmid 6CRskphQs73IADKsjwWABM5XtQ4UCGJLtmkUwZ2AatXzFEzPx9+27g9QACFX5x4IC3jZ TuFs1jRhPLYXjzwfDPDG7zmfdNlLjPZmuTMmbjmrpGLE51PRQBNbmsi7VHkdqRPE2Ihp lcimJootT8yvQ61hrnh3RmyM3muBBXBjceojfXu8dv/nPUBWQdQWYKui51xnl07qvBjt sfPM1iGKIT9QYXMFeMIoI4QCdEvCrWtHcF+CKYScqBCjsUglGLzXQiNBgte77KOOLk31 855Q== MIME-Version: 1.0 X-Received: by 10.15.81.136 with SMTP id x8mr9725286eey.9.1363993101989; Fri, 22 Mar 2013 15:58:21 -0700 (PDT) Received: by 10.14.129.9 with HTTP; Fri, 22 Mar 2013 15:58:21 -0700 (PDT) In-Reply-To: References: Date: Fri, 22 Mar 2013 15:58:21 -0700 Message-ID: Subject: Re: [GOOGLE] Fix the error when backporting r193857 from trunk From: Dehao Chen To: GCC Patches Cc: David Li X-Gm-Message-State: ALoCoQmOwTcLcw6JL+8iTLxLEE/JwuwKyp9RgjB67y08aXXsUFIudWkbm/gTUUK3RMCThW+DDQTOaVXPz6voVsi0ebUbcod7s4wUFqGPISA7DpDy+hqZNOLoytidFP6qe7fG/fjpxpwQZDQOg85JsW6Ur/LKEFWOABqr8KibWysOEMy1+48jZKykK+URoBVzqZeaPBtGLuxp forgot to attach the patch... On Fri, Mar 22, 2013 at 3:46 PM, Dehao Chen wrote: > Hi, > > This patch fixes the error in r193861, which backported r193857 from trunk. > > Bootstrapped and passed all gcc regression tests. > > Is it okay for google-4_7? > > Thanks, > Dehao Index: gcc/ipa-prop.c =================================================================== --- gcc/ipa-prop.c (revision 196984) +++ gcc/ipa-prop.c (working copy) @@ -2473,7 +2473,6 @@ base = gimple_call_arg (stmt, adj->base_index); loc = DECL_P (base) ? DECL_SOURCE_LOCATION (base) : EXPR_LOCATION (base); - loc = EXPR_LOCATION (base); if (TREE_CODE (base) != ADDR_EXPR && POINTER_TYPE_P (TREE_TYPE (base)))