Patchwork [GOOGLE] Fix the error when backporting r193857 from trunk

login
register
mail settings
Submitter Dehao Chen
Date March 22, 2013, 10:58 p.m.
Message ID <CAO2gOZXJR=+w7BdH+NBpAYN-EYgO4fRqXoC3c=XvhbQV4UWJzA@mail.gmail.com>
Download mbox | patch
Permalink /patch/230290/
State New
Headers show

Comments

Dehao Chen - March 22, 2013, 10:58 p.m.
forgot to attach the patch...


On Fri, Mar 22, 2013 at 3:46 PM, Dehao Chen <dehao@google.com> 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
Xinliang David Li - March 22, 2013, 11:02 p.m.
ok.

David

On Fri, Mar 22, 2013 at 3:58 PM, Dehao Chen <dehao@google.com> wrote:
> forgot to attach the patch...
>
> 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)))
>
> On Fri, Mar 22, 2013 at 3:46 PM, Dehao Chen <dehao@google.com> 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

Patch

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)))