Change breakpoint_re_set_default to a method

breakpoint_re_set_default is only ever called from breakpoint re_set
methods, so make it a protected method on code_breakpoint.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 37f70a777218f9ef862044643df68cbfd7eb2f13..35701930cacd2451e7ee7e5b6ba5a2d415fffa8f 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -87,8 +87,6 @@
 static void map_breakpoint_numbers (const char *,
                                    gdb::function_view<void (breakpoint *)>);
 
-static void breakpoint_re_set_default (code_breakpoint *);
-
 static void
   create_sals_from_location_spec_default (location_spec *locspec,
                                          linespec_result *canonical);
@@ -11515,7 +11513,7 @@ code_breakpoint::re_set ()
       return;
     }
 
-  breakpoint_re_set_default (this);
+  re_set_default ();
 }
 
 int
@@ -11951,7 +11949,7 @@ tracepoint_probe_create_sals_from_location_spec
 void
 dprintf_breakpoint::re_set ()
 {
-  breakpoint_re_set_default (this);
+  re_set_default ();
 
   /* extra_string should never be non-NULL for dprintf.  */
   gdb_assert (extra_string != NULL);
@@ -12723,28 +12721,28 @@ location_spec_to_sals (struct breakpoint *b, location_spec *locspec,
    breakpoints.  Reevaluate the breakpoint and recreate its
    locations.  */
 
-static void
-breakpoint_re_set_default (code_breakpoint *b)
+void
+code_breakpoint::re_set_default ()
 {
   struct program_space *filter_pspace = current_program_space;
   std::vector<symtab_and_line> expanded, expanded_end;
 
   int found;
   std::vector<symtab_and_line> sals
-    = location_spec_to_sals (b, b->locspec.get (), filter_pspace, &found);
+    = location_spec_to_sals (this, locspec.get (), filter_pspace, &found);
   if (found)
     expanded = std::move (sals);
 
-  if (b->locspec_range_end != nullptr)
+  if (locspec_range_end != nullptr)
     {
       std::vector<symtab_and_line> sals_end
-       = location_spec_to_sals (b, b->locspec_range_end.get (),
+       = location_spec_to_sals (this, locspec_range_end.get (),
                                 filter_pspace, &found);
       if (found)
        expanded_end = std::move (sals_end);
     }
 
-  update_breakpoint_locations (b, filter_pspace, expanded, expanded_end);
+  update_breakpoint_locations (this, filter_pspace, expanded, expanded_end);
 }
 
 /* Default method for creating SALs from an address string.  It basically

diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 4c62f9d46fcd2a520c1dd3f69a51238f9b409b6d..5316d193cc5712c4345ac03c2b60d0e1dff5084b 100644 (file)
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -886,6 +886,11 @@ struct code_breakpoint : public breakpoint
   std::vector<symtab_and_line> decode_location_spec
        (struct location_spec *locspec,
        struct program_space *search_pspace) override;
+
+protected:
+
+  /* Helper method that does the basic work of re_set.  */
+  void re_set_default ();
 };
 
 /* An instance of this type is used to represent a watchpoint,