Re: [GOOGLE] Updates highest_location when updating next_discriminator_location

2014-05-13 Thread Cary Coutant
> Attached patch passes regression tests and benchmark test. OK for google-4_9? OK. Thanks again! -cary

Re: [GOOGLE] Updates highest_location when updating next_discriminator_location

2014-05-13 Thread Dehao Chen
Attached patch passes regression tests and benchmark test. OK for google-4_9? Thanks, Dehao On Tue, May 13, 2014 at 10:43 AM, Dehao Chen wrote: > As discussed offline, this is actually due to missing parts of the > previous patch (some changes does not appear in the change log of > r199154). I'

Re: [GOOGLE] Updates highest_location when updating next_discriminator_location

2014-05-13 Thread Dehao Chen
As discussed offline, this is actually due to missing parts of the previous patch (some changes does not appear in the change log of r199154). I've updated the patch to include those missing pieces. Testing on going. Dehao On Tue, May 13, 2014 at 10:04 AM, Cary Coutant wrote: >> The problem is t

Re: [GOOGLE] Updates highest_location when updating next_discriminator_location

2014-05-13 Thread Cary Coutant
> The problem is that linemap_location_from_macro_expansion_p will > always return true if locus has discriminator. And in linemap_lookup, > this will lead to call linemap_macro_map_lookup, in which there is an > assertion: > > linemap_assert (line >= LINEMAPS_MACRO_LOWEST_LOCATION (set)); > > Howe

Re: [GOOGLE] Updates highest_location when updating next_discriminator_location

2014-05-13 Thread Dehao Chen
The problem is that linemap_location_from_macro_expansion_p will always return true if locus has discriminator. And in linemap_lookup, this will lead to call linemap_macro_map_lookup, in which there is an assertion: linemap_assert (line >= LINEMAPS_MACRO_LOWEST_LOCATION (set)); However, line is a

Re: [GOOGLE] Updates highest_location when updating next_discriminator_location

2014-05-13 Thread Cary Coutant
> Index: gcc/input.c > === > --- gcc/input.c (revision 210338) > +++ gcc/input.c (working copy) > @@ -910,6 +910,8 @@ location_with_discriminator (location_t locus, int >: next_discriminator_location); > >next_discriminator

[GOOGLE] Updates highest_location when updating next_discriminator_location

2014-05-13 Thread Dehao Chen
The previous checkin will break build for most application: http://gcc.gnu.org/viewcvs/gcc/branches/google/gcc-4_9/gcc/?view=log This patch fixes the regression by updating highest_location. Testing on-going, OK for google-4_9 branch? Thanks, Dehao Index: gcc/input.c =