diff options
author | Pedro Alves <pedro@codesourcery.com> | 2012-03-02 19:26:09 +0000 |
---|---|---|
committer | Pedro Alves <pedro@codesourcery.com> | 2012-03-02 19:26:09 +0000 |
commit | 38b87474eac01a30306b62ee94d719eca09c5f57 (patch) | |
tree | a3bf8f42ff98673186d5b9dffd685fdc9c85aa6b /gdb/target.c | |
parent | 370416f95095fa78ae7045224eeca50011a5e577 (diff) | |
download | gdb-38b87474eac01a30306b62ee94d719eca09c5f57.tar.gz |
2012-03-02 Tom Tromey <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
PR breakpoints/13776:
* breakpoint.c (breakpoint_init_inferior): Delete step-resume
breakpoints.
(delete_longjmp_breakpoint_at_next_stop): New.
* breakpoint.h (delete_longjmp_breakpoint_at_next_stop): Declare.
* target.c (generic_mourn_inferior): Call mark_breakpoints_out
before deleting the inferior. Add comments.
* thread.c (clear_thread_inferior_resources): Don't delete lonjmp
breakpoints immediately, but only on next stop. Move that code
next to where we mark other breakpoints for deletion.
Diffstat (limited to 'gdb/target.c')
-rw-r--r-- | gdb/target.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gdb/target.c b/gdb/target.c index 1f408f6f575..d29d37a1f0d 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3583,13 +3583,22 @@ generic_mourn_inferior (void) ptid = inferior_ptid; inferior_ptid = null_ptid; + /* Mark breakpoints uninserted in case something tries to delete a + breakpoint while we delete the inferior's threads (which would + fail, since the inferior is long gone). */ + mark_breakpoints_out (); + if (!ptid_equal (ptid, null_ptid)) { int pid = ptid_get_pid (ptid); exit_inferior (pid); } + /* Note this wipes step-resume breakpoints, so needs to be done + after exit_inferior, which ends up referencing the step-resume + breakpoints through clear_thread_inferior_resources. */ breakpoint_init_inferior (inf_exited); + registers_changed (); reopen_exec_file (); |