From f37e5866aa72e76f2199155fb838ffc25c78a26e Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 9 Jul 2020 12:40:40 -0700 Subject: [PATCH] Don't compare the pid returned from 'wait' against inferior_ptid. 'inf_ptrace::wait' needs to discard termination events reported by detached child processes. Previously it compared the returned pid against the pid in inferior_ptid to determine if a termination event should be discarded or reported. The multi-target changes cleared inferior_ptid to null_ptid in 'wait' target methods, so this was always failing and never reporting exit events. Instead, report termination events whose pid matches any inferior belonging to the current target. Several tests started failing on FreeBSD after the multi-target changes and pass again after this change. gdb/ChangeLog: * inf-ptrace.c (inf_ptrace_target::wait): Don't compare against inferior_ptid. --- gdb/ChangeLog | 5 +++++ gdb/inf-ptrace.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 40e22efd7eb..bdab91dd2d6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-07-09 John Baldwin + + * inf-ptrace.c (inf_ptrace_target::wait): Don't compare against + inferior_ptid. + 2020-07-09 John Baldwin * fbsd-tdep.c (fbsd_print_auxv_entry): Handle AT_FREEBSD_ARGC, diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index d25d226abba..ae0b0f7ff0d 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -347,7 +347,7 @@ inf_ptrace_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, } /* Ignore terminated detached child processes. */ - if (!WIFSTOPPED (status) && pid != inferior_ptid.pid ()) + if (!WIFSTOPPED (status) && find_inferior_pid (this, pid) == nullptr) pid = -1; } while (pid == -1); -- 2.30.2