From: Keith Seitz <keiths@redhat.com>
To: Pedro Alves <palves@redhat.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH] breakpoints/19546: Fix crash after updating breakpoints
Date: Wed, 10 Feb 2016 00:10:00 -0000 [thread overview]
Message-ID: <56BA7FC6.8090405@redhat.com> (raw)
In-Reply-To: <56BA7014.9070805@redhat.com>
On 02/09/2016 03:02 PM, Pedro Alves wrote:
> Thanks much Keith.
>
> LGTM, with a couple nits addressed.
All fixed, but I noted/fixed one other problem... Between "process
$decimal is executing ..." and the breakpoint notification,
native-{,extended-}gdbserver can output a bunch of solib load messages.
The patch I committed (below) addresses this by swallowing anything
between the two messages (".*" added to end of newline regexp).
Pushed. Thanks a bunch!
Keith
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index c059861..f99a7ab 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3764,6 +3764,14 @@ create_exception_master_breakpoint (void)
}
}
+/* Does B have a location spec? */
+
+static int
+breakpoint_event_location_empty_p (const struct breakpoint *b)
+{
+ return b->location != NULL && event_location_empty_p (b->location);
+}
+
void
update_breakpoints_after_exec (void)
{
@@ -3878,7 +3886,7 @@ update_breakpoints_after_exec (void)
/* Without a symbolic address, we have little hope of the
pre-exec() address meaning the same thing in the post-exec()
a.out. */
- if (event_location_empty_p (b->location))
+ if (breakpoint_event_location_empty_p (b))
{
delete_breakpoint (b);
continue;
@@ -13063,7 +13071,7 @@ static void
bkpt_re_set (struct breakpoint *b)
{
/* FIXME: is this still reachable? */
- if (event_location_empty_p (b->location))
+ if (breakpoint_event_location_empty_p (b))
{
/* Anything without a location can't be re-set. */
delete_breakpoint (b);
diff --git a/gdb/testsuite/gdb.base/infcall-exec.c
b/gdb/testsuite/gdb.base/infcall-exec.c
new file mode 100644
index 0000000..6617934
--- /dev/null
+++ b/gdb/testsuite/gdb.base/infcall-exec.c
@@ -0,0 +1,28 @@
+/* This test program is part of GDB, the GNU debugger.
+
+ Copyright 2016 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
+
+#include <unistd.h>
+
+int
+main (int argc, char ** argv)
+{
+ const char *prog = "inf-exec2";
+
+ execlp (prog, prog, (char *) 0);
+
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.base/infcall-exec.exp
b/gdb/testsuite/gdb.base/infcall-exec.exp
new file mode 100644
index 0000000..7b937fc
--- /dev/null
+++ b/gdb/testsuite/gdb.base/infcall-exec.exp
@@ -0,0 +1,48 @@
+# Copyright 2016 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test an inferior function call which execs a new program.
+# This is a test for breakpoints/19546.
+
+standard_testfile
+
+set testfile2 "infcall-exec2"
+set srcfile2 "${testfile2}.c"
+set binfile2 [standard_output_file $testfile2]
+
+# Build the two executables for the test.
+if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] !=
""} {
+ untested "could not build $binfile"
+ return -1
+}
+if {[gdb_compile $srcdir/$subdir/$srcfile2 $binfile2 executable debug]
!= ""} {
+ untested "could not build $binfile2"
+ return -1
+}
+
+clean_restart $binfile
+
+if {![runto_main]} {
+ untested "could not run to main"
+ return -1
+}
+
+set expected_result "process $decimal is executing new program: $binfile2"
+append expected_result "\[\r\n\]+.*"
+append expected_result "Breakpoint 1, main .*at .*$srcfile2:$decimal"
+append expected_result ".*"
+
+gdb_test "call execlp \(\"$binfile2\", \"$binfile2\", \(char \*\)0\)" \
+ $expected_result "call execlp"
diff --git a/gdb/testsuite/gdb.base/infcall-exec2.c
b/gdb/testsuite/gdb.base/infcall-exec2.c
new file mode 100644
index 0000000..bb2a008
--- /dev/null
+++ b/gdb/testsuite/gdb.base/infcall-exec2.c
@@ -0,0 +1,22 @@
+/* This test program is part of GDB, the GNU debugger.
+
+ Copyright 2016 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
+
+int
+main (int argc, char ** argv)
+{
+ return 0;
+}
prev parent reply other threads:[~2016-02-10 0:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 19:12 Keith Seitz
2016-02-09 23:02 ` Pedro Alves
2016-02-10 0:10 ` Keith Seitz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56BA7FC6.8090405@redhat.com \
--to=keiths@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).