Re: [GOOGLE] Add discriminator for inlined callsite

2013-08-19 Thread Cary Coutant
>> Patch updated. BTW, do you think this patch should actually go into trunk? > > This is OK for google branches. I don't think it can go into trunk > like this, as it relies on get_discriminator_from_locus. In trunk, we > only have the discriminator assigned to a basic block. Oh, but the dwarf2.d

Re: [GOOGLE] Add discriminator for inlined callsite

2013-08-19 Thread Cary Coutant
> Patch updated. BTW, do you think this patch should actually go into trunk? This is OK for google branches. I don't think it can go into trunk like this, as it relies on get_discriminator_from_locus. In trunk, we only have the discriminator assigned to a basic block. -cary > Index: include/dwa

Re: [GOOGLE] Add discriminator for inlined callsite

2013-08-19 Thread Dehao Chen
Patch updated. BTW, do you think this patch should actually go into trunk? Thanks, Dehao Index: include/dwarf2.def === --- include/dwarf2.def (revision 201852) +++ include/dwarf2.def (working copy) @@ -390,6 +390,8 @@ DW_AT (DW_AT_GN

Re: [GOOGLE] Add discriminator for inlined callsite

2013-08-19 Thread Cary Coutant
> - expanded_location s = expand_location (BLOCK_SOURCE_LOCATION (stmt)); > + location_t locus = BLOCK_SOURCE_LOCATION (stmt); > + expanded_location s = expand_location (locus); > >if (dwarf_version >= 3 || !dwarf_strict) > { >add_AT_file (die, DW_AT_call_file, lookup_filename (