> gcc/ChangeLog: > > * tree-cfg.c (locus_descrim_hasher::hash): Only hash lineno. > (locus_descrim_hasher::equal): Likewise. > (next_discriminator_for_locus): Likewise. > (assign_discriminator): Add return value. > (make_edges): Assign more discriminator if necessary. > (make_cond_expr_edges): Likewise. > (make_goto_expr_edges): Likewise. > > gcc/testsuite/ChangeLog: > > * gcc.dg/debug/dwarf2/discriminator.c: New Test.
Looks OK to me, but I can't approve patches for tree-cfg.c. Two comments: (1) In the C++ conversion, it looks like someone misspelled "discrim" in "locus_descrim_hasher". (2) Is this worth fixing in trunk when we'll eventually switch to a per-instruction discriminator? -cary