From aef4b7a5cc7ba4fb681a0675529000d91dc0aa72 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 21 May 2022 10:17:38 -0600 Subject: [PATCH] Move decode_location_spec to code_breakpoint breakpoint::decode_location_spec just asserts if called. It turned out to be relatively easy to remove this method from breakpoint and instead move the base implementation to code_breakpoint. --- gdb/breakpoint.c | 7 ------- gdb/breakpoint.h | 23 ++++++++++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index b24fbd1fe36..2fe74ea0d3a 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -11493,13 +11493,6 @@ breakpoint::print_recreate (struct ui_file *fp) const internal_error_pure_virtual_called (); } -std::vector -breakpoint::decode_location_spec (location_spec *locspec, - program_space *search_pspace) -{ - internal_error_pure_virtual_called (); -} - /* Default breakpoint_ops methods. */ void diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index e919fe6f0d2..aaf7549b660 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -710,16 +710,6 @@ struct breakpoint /* Print to FP the CLI command that recreates this breakpoint. */ virtual void print_recreate (struct ui_file *fp) const; - /* Given the location spec (second parameter), this method decodes - it and returns the SAL locations related to it. For ordinary - breakpoints, it calls `decode_line_full'. If SEARCH_PSPACE is - not NULL, symbol search is restricted to just that program space. - - This function is called inside `location_spec_to_sals'. */ - virtual std::vector decode_location_spec - (location_spec *locspec, - struct program_space *search_pspace); - /* Return true if this breakpoint explains a signal. See bpstat_explains_signal. */ virtual bool explains_signal (enum gdb_signal) @@ -883,12 +873,19 @@ struct code_breakpoint : public breakpoint const address_space *aspace, CORE_ADDR bp_addr, const target_waitstatus &ws) override; - std::vector decode_location_spec - (struct location_spec *locspec, - struct program_space *search_pspace) override; protected: + /* Given the location spec, this method decodes it and returns the + SAL locations related to it. For ordinary breakpoints, it calls + `decode_line_full'. If SEARCH_PSPACE is not NULL, symbol search + is restricted to just that program space. + + This function is called inside `location_spec_to_sals'. */ + virtual std::vector decode_location_spec + (location_spec *locspec, + struct program_space *search_pspace); + /* Helper method that does the basic work of re_set. */ void re_set_default (); -- 2.30.2