From a7d0f0f000b39269c25509a22a12549c6ef26b1f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 4 Jul 2018 11:32:50 -0600 Subject: [PATCH] Use exit_inferior in darwin_attach_pid Commit a50c11c666 was intended to use exit_inferior in darwin_attach_pid, but I accidentally pushed the wrong version of the patch. This fixes the problem. gdb/ChangeLog 2018-07-04 Tom Tromey * darwin-nat.c (darwin_attach_pid): Use exit_inferior. --- gdb/ChangeLog | 4 ++++ gdb/darwin-nat.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d2319c06d52..7bd0cc4f95e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-07-04 Tom Tromey + + * darwin-nat.c (darwin_attach_pid): Use exit_inferior. + 2018-07-04 Simon Marchi * common/common-defs.h (HAVE_USEFUL_SBRK): Define. diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 8104de53e7f..5aed285ad46 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -1662,8 +1662,7 @@ darwin_attach_pid (struct inferior *inf) } CATCH (ex, RETURN_MASK_ALL) { - inf->pid = 0; - inf->priv.reset (); + exit_inferior (inf); inferior_ptid = null_ptid; throw_exception (ex); -- 2.30.2