From 98aa42ee02c56378cecb737d01c27adca36bf48f Mon Sep 17 00:00:00 2001 From: Antoine Tremblay Date: Fri, 12 Jun 2015 07:58:47 -0400 Subject: [PATCH] Fix MI dprintf-insert not printing on a resolved pending location. This patch fixes the "Format string required" error when trying to print a dprintf on a now resolved, pending location when set via the MI interface even if the format string is entered correctly. This patch also adds a test case to check that issue called mi-dprintf-pending.exp. gdb/ChangeLog: PR breakpoints/16465 * breakpoint.c (create_breakpoint): Save extra_string for pending breakpoints. gdb/testsuite/ChangeLog: PR breakpoints/16465 * gdb.mi/mi-dprintf-pending.c: New file. * gdb.mi/mi-dprintf-pending.exp: New test. * gdb.mi/mi-dprintf-pendshr.c: New file. --- gdb/ChangeLog | 6 ++ gdb/breakpoint.c | 13 +++- gdb/testsuite/ChangeLog | 7 ++ gdb/testsuite/gdb.mi/mi-dprintf-pending.c | 25 +++++++ gdb/testsuite/gdb.mi/mi-dprintf-pending.exp | 79 +++++++++++++++++++++ gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c | 27 +++++++ 6 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.mi/mi-dprintf-pending.c create mode 100644 gdb/testsuite/gdb.mi/mi-dprintf-pending.exp create mode 100644 gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c5730cc4b8a..f22f11fc287 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-06-12 Antoine Tremblay + + PR breakpoints/16465 + * breakpoint.c (create_breakpoint): Save extra_string for + pending breakpoints. + 2015-06-10 Walfred Tedeschi * i386-tdep.c (i386_mpx_get_bt_entry): Add a cast for mpx_bd_mask diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 657c58ede57..0a960f89359 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9773,7 +9773,10 @@ create_breakpoint (struct gdbarch *gdbarch, b->addr_string = copy_arg; if (parse_arg) - b->cond_string = NULL; + { + b->cond_string = NULL; + b->extra_string = NULL; + } else { /* Create a private copy of condition string. */ @@ -9782,10 +9785,16 @@ create_breakpoint (struct gdbarch *gdbarch, cond_string = xstrdup (cond_string); make_cleanup (xfree, cond_string); } + /* Create a private copy of any extra string. */ + if (extra_string != NULL) + { + extra_string = xstrdup (extra_string); + make_cleanup (xfree, extra_string); + } b->cond_string = cond_string; + b->extra_string = extra_string; b->thread = thread; } - b->extra_string = NULL; b->ignore_count = ignore_count; b->disposition = tempflag ? disp_del : disp_donttouch; b->condition_not_parsed = 1; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4dbbd92d75e..e01f883a44c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2015-06-12 Antoine Tremblay + + PR breakpoints/16465 + * gdb.mi/mi-dprintf-pending.c: New file. + * gdb.mi/mi-dprintf-pending.exp: New test. + * gdb.mi/mi-dprintf-pendshr.c: New file. + 2015-06-10 Walfred Tedeschi Mircea Gherzan diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.c b/gdb/testsuite/gdb.mi/mi-dprintf-pending.c new file mode 100644 index 00000000000..191cab2592d --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.c @@ -0,0 +1,25 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2015 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 . */ + +extern void pendfunc (void); + +int +main (void) +{ + pendfunc (); + return 0; /* set breakpoint 1 here */ +} diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp new file mode 100644 index 00000000000..5bb4a1b2e0f --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pending.exp @@ -0,0 +1,79 @@ +# Copyright 2015 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 . + +# This test checks if dprintf prints correctly when it's resolved from +# pending state. +# See PR breakpoints/16465. + +load_lib mi-support.exp + +if {[skip_shlib_tests]} { + return 0 +} + +standard_testfile mi-dprintf-pending.c + +set libfile1 "mi-dprintf-pendshr" +set libsrc1 $srcdir/$subdir/$libfile1.c +set lib_sl1 [standard_output_file $libfile1.sl] +set lib_opts debug +set exec_opts [list debug shlib=$lib_sl1 shlib_load] + +if {[get_compiler_info]} { + return -1 +} + +if {[gdb_compile_shlib $libsrc1 $lib_sl1 $lib_opts] != ""} { + untested "Could not compile $libsrc1" + return -1 +} + +if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} { + untested "Could not compile $srcdir/$subdir/$srcfile" + return -1 +} + +# Start with a fresh gdb. +gdb_exit +mi_gdb_start +mi_gdb_reinitialize_dir $srcdir/$subdir +mi_gdb_load ${binfile} +mi_load_shlibs $lib_sl1 + +set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] + +# Set pending dprintf via MI. +mi_gdb_test "-dprintf-insert -f pendfunc1 \"hello\"" \ + ".*\\^done,bkpt={number=\"1\",type=\"dprintf\",disp=\"keep\",enabled=\"y\",addr=\"\",pending=\"pendfunc1\",times=\"0\",original-location=\"pendfunc1\"}" \ + "mi set dprintf" + +mi_create_breakpoint $bp_location1 "mi insert breakpoint bp_location1" \ + -type "breakpoint" -line $bp_location1 -file $srcdir/$subdir/$srcfile + +mi_run_cmd + +set msg "mi dprintf" +gdb_expect { + -re ".*~\"hello\"" { + pass $msg + } + -re ".*$mi_gdb_prompt$" { + fail $msg + } + timeout { + fail $msg + } +} +mi_expect_stop ".*" "main" ".*" ".*$srcfile" "$bp_location1" "" "$msg stop" diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c b/gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c new file mode 100644 index 00000000000..05d188cbbdc --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-pendshr.c @@ -0,0 +1,27 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2015 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 . */ + +void +pendfunc1 (void) +{ +} + +void +pendfunc (void) +{ + pendfunc1 (); +} -- 2.39.5