diff options
| author | Pedro Alves <palves@redhat.com> | 2016-08-10 23:03:29 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-08-10 23:03:29 +0100 |
| commit | 01d3dedf60912cee478c242d575f4683adada1d2 (patch) | |
| tree | 6fea701105eb975dc6e274ab07eaf65e217e5f21 | |
| parent | 73971819031d74eb846805a9fbfad04ba1dff500 (diff) | |
| download | gdb-01d3dedf60912cee478c242d575f4683adada1d2.zip gdb-01d3dedf60912cee478c242d575f4683adada1d2.tar.gz gdb-01d3dedf60912cee478c242d575f4683adada1d2.tar.bz2 | |
Fix PR gdb/19187 (process record over a fork causes internal error)
Right after a fork is detected, we detach breakpoints from the child
(detach_breakpoints), which calls into target_remove_breakpoint with
inferior_ptid pointing at the child process, but leaves the breakpoint
marked inserted (in the parent).
The problem is that record-full.c always deletes all knowledge of the
breakpoint. Then when we later really delete the breakpoint from the
parent, we fail the assertion, since the breakpoint is unexpectedly
not found in the record-full.c breakpoint table.
The fix is simply to not forget about the breakpoint if we're
detaching it from a fork child.
gdb/ChangeLog:
2016-08-10 Pedro Alves <palves@redhat.com>
PR gdb/19187
* record-full.c (record_full_remove_breakpoint): Don't remove the
breakpoint from the record_full_breakpoints VEC if we're detaching
the breakpoint from a fork child.
gdb/testsuite/ChangeLog:
2016-08-10 Pedro Alves <palves@redhat.com>
PR gdb/19187
* gdb.reverse/waitpid-reverse.exp: Add comment and remove
setup_kfails.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/record-full.c | 7 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.reverse/waitpid-reverse.exp | 4 |
4 files changed, 20 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bdd28fe..c5ffe47 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,6 +1,13 @@ 2016-08-10 Pedro Alves <palves@redhat.com> PR gdb/19187 + * record-full.c (record_full_remove_breakpoint): Don't remove the + breakpoint from the record_full_breakpoints VEC if we're detaching + the breakpoint from a fork child. + +2016-08-10 Pedro Alves <palves@redhat.com> + + PR gdb/19187 * break-catch-sig.c (signal_catchpoint_remove_location): Adjust interface. * break-catch-syscall.c (remove_catch_syscall): diff --git a/gdb/record-full.c b/gdb/record-full.c index 4134f39..3777315 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -1731,8 +1731,11 @@ record_full_remove_breakpoint (struct target_ops *ops, return ret; } - VEC_unordered_remove (record_full_breakpoint_p, - record_full_breakpoints, ix); + if (reason == REMOVE_BREAKPOINT) + { + VEC_unordered_remove (record_full_breakpoint_p, + record_full_breakpoints, ix); + } return 0; } } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1b9ffed..bfd1748 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-08-10 Pedro Alves <palves@redhat.com> + + PR gdb/19187 + * gdb.reverse/waitpid-reverse.exp: Add comment and remove + setup_kfails. + 2016-08-09 Pedro Alves <palves@redhat.com> Simon Marchi <simon.marchi@ericsson.com> diff --git a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp index d583953..e8a1690 100644 --- a/gdb/testsuite/gdb.reverse/waitpid-reverse.exp +++ b/gdb/testsuite/gdb.reverse/waitpid-reverse.exp @@ -18,6 +18,8 @@ # # This test tests waitpid syscall for reverse execution. # +# Also serves as regression test for gdb/19187 (recording across a +# fork). if ![supports_reverse] { return @@ -40,14 +42,12 @@ gdb_test "break marker2" \ "Breakpoint $decimal at $hex: file .*$srcfile, line $decimal.*" \ "set breakpoint at marker2" -setup_kfail "gdb/19187" *-*-* gdb_continue_to_breakpoint "marker2" ".*$srcfile:.*" gdb_test "break marker1" \ "Breakpoint $decimal at $hex: file .*$srcfile, line $decimal.*" \ "set breakpoint at marker1" -setup_kfail "gdb/19187" *-*-* gdb_test "reverse-continue" ".*$srcfile:$decimal.*" "reverse to marker1" # If the variable was recorded properly on syscall, the old contents (-1) |