diff options
| author | Tom Tromey <tom@tromey.com> | 2019-03-23 10:11:51 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-03-23 10:59:10 -0600 |
| commit | 7ad417dd217849c164e3c8a250c62a98eb0b8cd4 (patch) | |
| tree | 7c5a868ea6aa91f34146092c15dd550986086218 /gdb/breakpoint.c | |
| parent | b366c208ee07924cc3cafc1bd4d70548bc91075b (diff) | |
| download | fsf-binutils-gdb-7ad417dd217849c164e3c8a250c62a98eb0b8cd4.zip fsf-binutils-gdb-7ad417dd217849c164e3c8a250c62a98eb0b8cd4.tar.gz fsf-binutils-gdb-7ad417dd217849c164e3c8a250c62a98eb0b8cd4.tar.bz2 | |
Have parser reset the innermost block tracker
I ran across a comment in symfile.c today:
/* Clear globals which might have pointed into a removed objfile.
FIXME: It's not clear which of these are supposed to persist
between expressions and which ought to be reset each time. */
It seems to me that this can be clarified: the parser entry points
ought to reset the innermost block tracker (and the expression context
block), and these should not be considered valid for code to use at
arbitrary times -- only immediately after an expression has been
parsed.
This patch implements this idea. This could be further improved by
removing the parser globals and changing the parser functions to
return this information, but I have not done this.
Tested by the buildbot.
gdb/ChangeLog
2019-03-23 Tom Tromey <tom@tromey.com>
* varobj.c (varobj_create): Update.
* symfile.c (clear_symtab_users): Don't reset innermost_block.
* printcmd.c (display_command, do_one_display): Don't reset
innermost_block.
* parser-defs.h (enum innermost_block_tracker_type): Move to
expression.h.
(innermost_block): Update comment.
* parse.c (parse_exp_1): Add tracker_types parameter.
(parse_exp_in_context): Rename from parse_exp_in_context_1. Add
tracker_types parameter. Reset innermost_block.
(parse_exp_in_context): Remove.
(parse_expression_for_completion): Update.
* objfiles.c (~objfile): Don't reset expression_context_block or
innermost_block.
* expression.h (enum innermost_block_tracker_type): Move from
parser-defs.h.
(parse_exp_1): Add tracker_types parameter.
* breakpoint.c (set_breakpoint_condition, watch_command_1): Don't
reset innermost_block.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index dd122be..855bd38 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -880,7 +880,6 @@ set_breakpoint_condition (struct breakpoint *b, const char *exp, { struct watchpoint *w = (struct watchpoint *) b; - innermost_block.reset (); arg = exp; w->cond_exp = parse_exp_1 (&arg, 0, 0, 0); if (*arg) @@ -10602,7 +10601,6 @@ watch_command_1 (const char *arg, int accessflag, int from_tty, /* Parse the rest of the arguments. From here on out, everything is in terms of a newly allocated string instead of the original ARG. */ - innermost_block.reset (); std::string expression (arg, exp_end - arg); exp_start = arg = expression.c_str (); expression_up exp = parse_exp_1 (&arg, 0, 0, 0); @@ -10664,7 +10662,6 @@ watch_command_1 (const char *arg, int accessflag, int from_tty, toklen = end_tok - tok; if (toklen >= 1 && strncmp (tok, "if", toklen) == 0) { - innermost_block.reset (); tok = cond_start = end_tok + 1; parse_exp_1 (&tok, 0, 0, 0); |