Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

gdb: remove breakpoint_re_set_one

Browse Source 
During a later patch I wanted to reset a single breakpoint, so I
called breakpoint_re_set_one.  However, this is not the right thing to
do.  If we look at breakpoint_re_set then we see that there's a whole
bunch of state that needs to be preserved prior to calling
breakpoint_re_set_one, and after calling breakpoint_re_set_one we
still need to call update_global_location_list.

I could just update the comment on breakpoint_re_set_one to make it
clearer how the function should be used -- or more likely to warn that
the function should only be used as a helper from breakpoint_re_set.

However, breakpoint_re_set_one is only 3 lines long.  So I figure it
might actually be easier to just fold breakpoint_re_set_one into
breakpoint_re_set, then there's no risk of accidentally calling
breakpoint_re_set_one when we shouldn't.

There should be no user visible changes after this commit.
This commit is contained in:
Andrew Burgess
2023-04-14 14:45:38 +01:00
parent 7934cb137a
commit b172d94b62
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gdb/breakpoint.c
View File

@@ -13214,17 +13214,6 @@ create_sals_from_location_spec_default (location_spec *locspec,
parse_breakpoint_sals (locspec, canonical);
}
/* Reset a breakpoint. */
static void
breakpoint_re_set_one (breakpoint *b)
{
input_radix = b->input_radix;
set_language (b->language);
b->re_set ();
}
/* Re-set breakpoint locations for the current program space.
Locations bound to other program spaces are left untouched. */
@@ -13236,12 +13225,11 @@ breakpoint_re_set (void)
scoped_restore save_input_radix = make_scoped_restore (&input_radix);
scoped_restore_current_pspace_and_thread restore_pspace_thread;
/* breakpoint_re_set_one sets the current_language to the language
of the breakpoint it is resetting (see prepare_re_set_context)
before re-evaluating the breakpoint's location. This change can
unfortunately get undone by accident if the language_mode is set
to auto, and we either switch frames, or more likely in this context,
we select the current frame.
/* To ::re_set each breakpoint we set the current_language to the
language of the breakpoint before re-evaluating the breakpoint's
location. This change can unfortunately get undone by accident if
the language_mode is set to auto, and we either switch frames, or
more likely in this context, we select the current frame.
We prevent this by temporarily turning the language_mode to
language_mode_manual. We restore it once all breakpoints
@@ -13258,7 +13246,9 @@ breakpoint_re_set (void)
{
try
{
breakpoint_re_set_one (&b);
input_radix = b.input_radix;
set_language (b.language);
b.re_set ();
}
catch (const gdb_exception &ex)
{