Re: [RFA/linespec] wrong line number in breakpoint location

[Joel Brobecker <brobecker@adacore.com>]

> That change sounds good to me, but I'd suggest waiting to see if other
> people have something to say.

Thanks, and of course!

> I noted two nits.
> >   1. We resolve the small.c:8 linespec into a symtab_and_line which
> 
> small.c:18

Fixed.

> > +/* We implement the following function as far away from the first line
> > +   of this file, so as to reduce confusion between line numbers from
> > +   this file, and line numbers from body.inc (which only really has
> 
> body.inc is now called break-include.inc.  I am a bit confused with "as far
> away from the first line of this file".  From what I understand, the
> important thing is that the next function is at a different line than the
> assignment in break-include.inc, to avoid the risk of having a false PASS?

That's correct. Attached is a second version of the patch which
hopefully clarifies everything:

/* The following function's implementation starts by including a file
   (break-include.inc) which contains a copyright header followed by
   a single C statement.  When we break on the line where the function
   name is declared, we expect GDB to skip the function's prologue,
   and insert the breakpoint on the first line of "user" code for
   that function, which we have set up to be that single statement
   break-include.inc provides.

   The purpose of this testcase is to verify that, when we insert
   that breakpoint, GDB reports the location as being in that include
   file, but also using the correct line number inside that include
   file -- NOT the line number we originally used to insert the
   breakpoint, nor the location where the file is included from.
   In order to verify that GDB shows the right line number, we must
   be careful that this first statement located in break-include.inc
   and our function are not on the same line number.  Otherwise,
   we could potentially have a false PASS.

   This is why we implement the following function as far away
   from the start of this file as possible, as we know that
   break-include.inc is a fairly short file (copyright header
   and single statement only).  */

gdb/ChangeLog:

        * linespec.c (create_sals_line_offset): Remove code that preserved
        the symtab_and_line's line number.

gdb/testsuite/ChangeLog:

        * break-include.c, break-include.inc, break-include.exp: New files.
        * gdb.base/ending-run.exp: Minor adaptations due to the breakpoint's
        line number now being the actual line number where the breakpoint
        was inserted.
        * gdb.mi/mi-break.exp: Likewise.
        * gdb.mi/mi-reverse.exp: Likewise.
        * gdb.mi/mi-simplerun.exp: Ditto.

Tested on x86_64-linux.

Thanks,
-- 
Joel