[GOOGLE] backport discriminator support from google-4_8 to google-4_9

[Dehao Chen]

Yes, this patch is a combination of all these patches. Some of them
are already in trunk.

Dehao

On Mon, May 12, 2014 at 1:28 PM, Cary Coutant <ccoutant@google.com> wrote:
> On Mon, May 12, 2014 at 1:11 PM, Dehao Chen <dehao@google.com> wrote:
>> This patch backports r199154 from google-4_8 to google-4_9
>>
>> Bootstrapped and passed regression test.
>>
>> OK for google-4_9 branch?
>
> Don't forget the follow-ons listed below. Any reason not to combine
> them into this patch?
>
> Looks good. Thanks!
>
> -cary
>
>
> r201928 | dehao | 2013-08-22 10:20:29 -0700 (Thu, 22 Aug 2013) | 7 lines
>
> Set discriminator for call stmts within a same basic block.
>
> 2013-08-22  Dehao Chen  <dehao@google.com>
>
>         * gcc/tree-cfg.c (assign_discriminators): assign discriminator for
>         call stmt in a same BB if it is mapped to a same line.
>
> ------------------------------------------------------------------------
> r201857 | dehao | 2013-08-19 14:26:33 -0700 (Mon, 19 Aug 2013) | 7 lines
>
> Fix the discriminator assignment bug during hashing.
>
> 2013-08-19  Dehao Chen  <dehao@google.com>
>
>         * tree-cfg.c (next_discriminator_for_locus): Fix discriminator
>         assignment bug.
>
> ------------------------------------------------------------------------
> r200655 | dehao | 2013-07-03 18:15:18 -0700 (Wed, 03 Jul 2013) | 10 lines
>
> Updates discriminator in a correct way.
>
> 2013-07-03  Dehao Chen  <dehao@google.com>
>
>         * gcc/input.c (location_with_discriminator): Updates discrminator
>         in a correct way.
>         (get_discriminator_from_locus): Change data type.
>         * gcc/tree-cfg.c (same_line_p): Use expand_location to check same_line.
>         (assign_discriminator): Updates discrminator in a correct way.
>
> ------------------------------------------------------------------------
> r199303 | dehao | 2013-05-24 10:04:31 -0700 (Fri, 24 May 2013) | 20 lines
>
> Backport r199295 from trunk.
>
> Change the discriminator assignment algorithm to make it more robust.
>
> 2013-05-24  Dehao Chen  <dehao@google.com>
>
>         * gcc/testsuite/gcc.dg/debug/dwarf2/discriminator.c: New Testcase.
>         * gcc/tree-cfg.c (locus_descrim_hasher::hash): Change discrminator
>         hash function.
>         (locus_descrim_hasher::equal): Likewise.
>         (build_gimple_cfg): New discrminator assignmnet algorithm
>         (make_edges): Likewise.
>         (next_discriminator_for_locus): Likewise.
>         (same_line_p): Likewise.
>         (assign_discriminators): Likewise.
>         (make_cond_expr_edges): Likewise.
>         (make_gimple_switch_edges): Likewise.
>         (make_goto_expr_edges): Likewise.
>         (make_gimple_asm_edges): Likewise.