> On Mon, 2016-05-02 at 11:50 -0600, Martin Sebor wrote:
> > Hi Jan,
> > 
> > I just noticed the compilation errors in the attached file with
> > the latest trunk.  It seems as though your recent patch below may
> > be incomplete:
> > 
> >    commit 46e5dccc6f188bd0fd5af4e9778f547ab63c9cae
> >    Author: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
> >    Date: Mon May 2 16:55:56 2016 +0000
> > 
> > The following change causes compilation errors due to
> > ipa_find_agg_cst_for_param taking just three arguments, while it
> > is being called with four.  (I haven't looked into the other error.)
> > 
> > Regards
> > Martin
> > 
> > --- a/gcc/ipa-inline-analysis.c
> > +++ b/gcc/ipa-inline-analysis.c
> > @@ -850,7 +850,8 @@ evaluate_conditions_for_known_args (struct 
> > cgraph_node *node
> > ,
> >            if (known_aggs.exists ())
> >              {
> >                agg = known_aggs[c->operand_num];
> > -             val = ipa_find_agg_cst_for_param (agg, c->offset, c
> > ->by_ref);
> > +             val = ipa_find_agg_cst_for_param (agg, 
> > known_vals[c->operand_num],
> > +                                               c->offset, c
> > ->by_ref);
> 
> I saw this too (with r235766).  I believe it's fixed by r235770 and
> r235771:
> 
>  2016-05-02  Jan Hubicka  <hubi...@ucw.cz>
>  
>       * cif-code.def (CIF_THUNK): Add.
>       * ipa-inline-analsysis.c (evaluate_conditions_for_known_args): Revert
>       accidental change.
> 
> (albeit with a typo in that second filename)
Uh, thanks. Will fix that with next commit.

I amanaged to accidentaly bundle unrelated changes to the patch. My apologizes
for that. Will try to keep my commit tree clean.
Honza

Reply via email to