From 9f61929fd82fb632ee7c3be883d7086afc5c65d0 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Tue, 9 Feb 2016 10:02:53 -0800 Subject: [PATCH] python/19506 -- gdb.Breakpoint address location regression Now that "legacy" linespecs benefit from consolidated support in string_to_event_location_basic, python's Breakpoint command should use this function to turn strings into event locations. As a result, this patch fixes python/19506. Before: (gdb) python gdb.Breakpoint("*main") Traceback (most recent call last): File "", line 1, in RuntimeError: Function "*main" not defined. Error while executing Python code. After: (gdb) python gdb.Breakpoint("*main") Breakpoint 1 at 0x4005fb: file ../../../src/gdb/testsuite/gdb.python/py-breakpoint.c, line 32. gdb/ChangeLog PR python/19506 * python/py-breakpoint.c (bppy_init): Use string_to_event_location_basic instead of new_linespec_location. gdb/testsuite/ChangeLog PR python/19506 * gdb.python/py-breakpoint.exp (test_bkpt_address): New procedure. (toplevel): Call test_bkpt_address. --- gdb/ChangeLog | 6 ++++ gdb/python/py-breakpoint.c | 5 ++-- gdb/testsuite/ChangeLog | 6 ++++ gdb/testsuite/gdb.python/py-breakpoint.exp | 33 ++++++++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1077d605bbb..64fc7966682 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-02-09 Keith Seitz + + PR python/19506 + * python/py-breakpoint.c (bppy_init): Use + string_to_event_location_basic instead of new_linespec_location. + 2016-02-09 Keith Seitz * location.c (string_to_explicit_location): Note that "-p" is diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 85b17d5aa5f..964ec6204fe 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -663,7 +663,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) TRY { - char *copy = xstrdup (spec); + char *copy = xstrdup (skip_spaces_const (spec)); struct cleanup *cleanup = make_cleanup (xfree, copy); switch (type) @@ -672,7 +672,8 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) { struct event_location *location; - location = new_linespec_location (©); + location + = string_to_event_location_basic (©, current_language); make_cleanup_delete_event_location (location); create_breakpoint (python_gdbarch, location, NULL, -1, NULL, diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 68b4e429836..38f1fc5e8e3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-02-09 Keith Seitz + + PR python/19506 + * gdb.python/py-breakpoint.exp (test_bkpt_address): New procedure. + (toplevel): Call test_bkpt_address. + 2016-02-09 Simon Marchi * configure.ac: Use AC_CONFIG_FILES instead of passing arguments diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp index af6c5fce3b0..d1d1b2253f9 100644 --- a/gdb/testsuite/gdb.python/py-breakpoint.exp +++ b/gdb/testsuite/gdb.python/py-breakpoint.exp @@ -462,6 +462,38 @@ proc test_bkpt_temporary { } { } } +# Test address locations. + +proc test_bkpt_address {} { + global gdb_prompt decimal srcfile + + # Delete all breakpoints + delete_breakpoints + + gdb_test "python gdb.Breakpoint(\"*main\")" \ + ".*Breakpoint ($decimal)+ at .*$srcfile, line ($decimal)+\." + + gdb_py_test_silent_cmd \ + "python main_loc = gdb.parse_and_eval(\"main\").address" \ + "eval address of main" 0 + + # Python 2 vs 3 ... Check `int' first. If that fails, try `long'. + gdb_test_multiple "python main_addr = int(main_loc)" "int value of main" { + -re "Traceback.*$gdb_prompt $" { + gdb_test_no_output "python main_addr = long(main_loc)" \ + "long value of main" + } + -re "$gdb_prompt $" { + pass "int value of main" + } + } + + # Include whitespace in the linespec to double-check proper + # grokking of argument to gdb.Breakpoint. + gdb_test "python gdb.Breakpoint(\" *{}\".format(str(main_addr)))" \ + ".*Breakpoint ($decimal)+ at .*$srcfile, line ($decimal)+\." +} + test_bkpt_basic test_bkpt_deletion test_bkpt_cond_and_cmds @@ -470,3 +502,4 @@ test_watchpoints test_bkpt_internal test_bkpt_eval_funcs test_bkpt_temporary +test_bkpt_address -- 2.30.2