Re: [PATCH 2/2] Report stop locations in inlined functions.

[Keith Seitz <keiths@redhat.com>]

On 07/18/2017 10:16 AM, Pedro Alves wrote:
>>
>> I don't quite like this, though.  This solution involves calling
>> decode_line_full, and that is really expensive, so I would be grateful if
>> maintaienrs could offer advice on how to better tackle this.
> 
> I'm still trying to grok these patches fully, but, shouldn't comparing
> the breakpoint's bp_location's addresses work the same?  I.e., with this,
> gdb.opt/inline-break.exp still passes cleanly here:

I've played with your suggestion, and I *think* I am getting close. :-)

> diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
> index 006ae0d..9120554 100644
> --- a/gdb/inline-frame.c
> +++ b/gdb/inline-frame.c
> @@ -349,23 +330,19 @@ skip_inline_frames (ptid_t ptid, struct breakpoint *bpt)
>  	      if (BLOCK_START (cur_block) == this_pc
>  		  || block_starting_point_at (this_pc, cur_block))
>  		{
> -		  int lsal_i;
> -		  struct linespec_sals *lsal;
>  		  bool skip_this_frame = true;
>  
> -		  for (lsal_i = 0;
> -		       VEC_iterate (linespec_sals, canonical.sals,
> -				    lsal_i, lsal); lsal_i++)
> +		  if (bpt != NULL
> +		      && breakpoint_address_is_meaningful (bpt))
>  		    {
> -		      struct symtabs_and_lines &sals = lsal->sals;
> -
> -		      for (int sals_i = 0; sals_i < sals.nelts; sals_i++)
> -			{
> -			  struct symtab_and_line &sal = sals.sals[sals_i];
> -
> -			  if (sal.pc == this_pc)
> +		      for (bp_location *loc = bpt->loc;
> +			   loc != NULL;
> +			   loc = loc->next)
> +			if (this_pc == loc->address)
> +			  {
>  			    skip_this_frame = false;
> -			}
> +			    break;
> +			  }
>  		    }
>  
>  		  if (skip_this_frame)
> 

The next version of this patch does this, and it works. One small addition I had to make was to /not/ skip inline frames for non-user breakpoints. step-resume breakpoints, IIRC, were otherwise broken.

Keith