mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
a9e408182d
Consider the following situation, where we have one file containing...
$ cat -n body.inc
1 i = i + 1;
... we include that file from some code, like so:
$ cat -n cat -n small.c
[...]
17 int
18 next (int i)
19 {
20 #include "body.inc"
21 return i;
22 }
When trying to insert a breakpoint on line 18, for instance:
(gdb) b small.c:18
Breakpoint 1 at 0x40049f: file body.inc, line 18.
^^
||
Here, the issue is that GDB reports the breakpoint to be in file
body.inc, which is true, but with the line number that corresponding
to the user-requested location, which is not correct.
Although the simple reproducer may look slightly artificial,
the above is simply one way to reproduce the same issue observed
when trying to insert a breakpoint on a function provided in
a .h files and then subsequently inlined in a C file.
What happens is the following:
1. We resolve the small.c:18 linespec into a symtab_and_line which
has "small.c" and 18 as the symtab and line number.
2. Next, we call skip_prologue_sal, which calculates the PC
past the prologue, and updates the symtab_and_line: PC,
but also symtab (now body.inc) and the new line (now 1).
3. However, right after that, we do:
/* Make sure the line matches the request, not what was
found. */
intermediate_results.sals[i].line = val.line;
We should either restore both symtab and line, or leave the actual
line to match the actual symtab. This patch chose the latter.
This introduces a few changes in a few tests, which required some
updates, but looking at those change, I believe them to be expected.
gdb/ChangeLog:
* linespec.c (create_sals_line_offset): Remove code that preserved
the symtab_and_line's line number.
gdb/testsuite/ChangeLog:
* gdb.base/break-include.c, gdb.base/break-include.inc,
gdb.base/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.
|
||
|---|---|---|
| .. | ||
| array.f | ||
| basics.c | ||
| ChangeLog-1999-2003 | ||
| dw2-ref-missing-frame-func.c | ||
| dw2-ref-missing-frame-main.c | ||
| dw2-ref-missing-frame.exp | ||
| dw2-ref-missing-frame.S | ||
| gdb669.exp | ||
| gdb680.exp | ||
| gdb701.c | ||
| gdb701.exp | ||
| gdb792.cc | ||
| gdb792.exp | ||
| gdb2549.exp | ||
| list-thread-groups-available.c | ||
| list-thread-groups-available.exp | ||
| mi2-amd64-entry-value.c | ||
| mi2-amd64-entry-value.exp | ||
| mi2-amd64-entry-value.s | ||
| mi2-prompt.exp | ||
| mi2-var-child.exp | ||
| mi-async-run.c | ||
| mi-async-run.exp | ||
| mi-async.exp | ||
| mi-basics.exp | ||
| mi-break.exp | ||
| mi-breakpoint-changed.exp | ||
| mi-catch-load-so.c | ||
| mi-catch-load.c | ||
| mi-catch-load.exp | ||
| mi-cli.exp | ||
| mi-cmd-error.exp | ||
| mi-cmd-param-changed.exp | ||
| mi-condbreak-call-thr-state-mt.c | ||
| mi-condbreak-call-thr-state-st.c | ||
| mi-condbreak-call-thr-state.c | ||
| mi-condbreak-call-thr-state.exp | ||
| mi-console.c | ||
| mi-console.exp | ||
| mi-detach.exp | ||
| mi-disassemble.exp | ||
| mi-dprintf-pending.c | ||
| mi-dprintf-pending.exp | ||
| mi-dprintf-pendshr.c | ||
| mi-dprintf.c | ||
| mi-dprintf.exp | ||
| mi-editing.exp | ||
| mi-eval.exp | ||
| mi-exec-run.exp | ||
| mi-exit-code.c | ||
| mi-exit-code.exp | ||
| mi-file-transfer.exp | ||
| mi-file.exp | ||
| mi-fill-memory.exp | ||
| mi-frame-regs.exp | ||
| mi-fullname-deleted.exp | ||
| mi-hack-cli.exp | ||
| mi-i-cmd.exp | ||
| mi-info-os.exp | ||
| mi-inheritance-syntax-error.cc | ||
| mi-inheritance-syntax-error.exp | ||
| mi-language.exp | ||
| mi-linespec-err-cp.cc | ||
| mi-linespec-err-cp.exp | ||
| mi-logging.exp | ||
| mi-memory-changed.exp | ||
| mi-nonstop-exit.exp | ||
| mi-nonstop.exp | ||
| mi-ns-stale-regcache.exp | ||
| mi-nsintrall.exp | ||
| mi-nsmoribund.exp | ||
| mi-nsthrexec.exp | ||
| mi-pending.c | ||
| mi-pending.exp | ||
| mi-pendshr2.c | ||
| mi-pendshr.c | ||
| mi-pthreads.exp | ||
| mi-read-memory.c | ||
| mi-read-memory.exp | ||
| mi-record-changed.exp | ||
| mi-reg-undefined.c | ||
| mi-reg-undefined.exp | ||
| mi-reg-undefined.S | ||
| mi-regs.exp | ||
| mi-return.exp | ||
| mi-reverse.exp | ||
| mi-simplerun.exp | ||
| mi-solib.exp | ||
| mi-stack.c | ||
| mi-stack.exp | ||
| mi-start.c | ||
| mi-start.exp | ||
| mi-stepi.exp | ||
| mi-stepn.c | ||
| mi-stepn.exp | ||
| mi-syn-frame.c | ||
| mi-syn-frame.exp | ||
| mi-threads-interrupt.c | ||
| mi-threads-interrupt.exp | ||
| mi-undefined-cmd.exp | ||
| mi-until.exp | ||
| mi-var-block.exp | ||
| mi-var-child-f.exp | ||
| mi-var-child.c | ||
| mi-var-child.exp | ||
| mi-var-cmd.exp | ||
| mi-var-cp.cc | ||
| mi-var-cp.exp | ||
| mi-var-create-rtti.c | ||
| mi-var-create-rtti.exp | ||
| mi-var-display.exp | ||
| mi-var-invalidate.exp | ||
| mi-var-list-children-invalid-grandchild.c | ||
| mi-var-list-children-invalid-grandchild.exp | ||
| mi-var-rtti.cc | ||
| mi-var-rtti.exp | ||
| mi-vla-c99.exp | ||
| mi-vla-fortran.exp | ||
| mi-watch-nonstop.exp | ||
| mi-watch.exp | ||
| new-ui-mi-sync.c | ||
| new-ui-mi-sync.exp | ||
| non-stop-exit.c | ||
| non-stop.c | ||
| ns-stale-regcache.c | ||
| nsintrall.c | ||
| nsmoribund.c | ||
| nsthrexec.c | ||
| pending.c | ||
| pendshr1.c | ||
| pendshr2.c | ||
| pr11022.c | ||
| pr11022.exp | ||
| pthreads.c | ||
| solib-lib.c | ||
| solib-main.c | ||
| testcmds | ||
| until.c | ||
| user-selected-context-sync.c | ||
| user-selected-context-sync.exp | ||
| var-cmd.c | ||
| vla.c | ||
| vla.f90 | ||
| watch-nonstop.c | ||