diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2017-10-18 19:53:21 +0100 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2018-01-21 15:15:47 +0000 |
| commit | aee1fcdf979d65c7623533ddd6d871767be9de13 (patch) | |
| tree | 8497a2f48d301efd6d51c648e3b489b7db820b62 /gdb/ada-lang.c | |
| parent | 396af9a1527b396c251e70b5c79b5fc83fd1d7ff (diff) | |
| download | gdb-aee1fcdf979d65c7623533ddd6d871767be9de13.zip gdb-aee1fcdf979d65c7623533ddd6d871767be9de13.tar.gz gdb-aee1fcdf979d65c7623533ddd6d871767be9de13.tar.bz2 | |
gdb: New API for tracking innermost block
This commit is preparation for a later change, at this point there
should be no user visible change.
We currently maintain a global innermost_block which tracks the most
inner block encountered when parsing an expression.
This commit wraps the innermost_block into a new class, and switches all
direct accesses to the variable to use the class API.
gdb/ChangeLog:
* ada-exp.y (write_var_from_sym): Switch to innermost_block API.
* ada-lang.c (resolve_subexp): Likewise.
* breakpoint.c (set_breakpoint_condition) Likewise.
(watch_command_1) Likewise.
* c-exp.y (variable): Likewise.
* d-exp.y (PrimaryExpression): Likewise.
* f-exp.y (variable): Likewise.
* go-exp.y (variable): Likewise.
* m2-exp.y (variable): Likewise.
* objfiles.c (objfile::~objfile): Likewise.
* p-exp.y (variable): Likewise.
* parse.c (innermost_block): Change type.
* parser-defs.h (class innermost_block_tracker): New.
(innermost_block): Change to innermost_block_tracker.
* printcmd.c (display_command): Switch to innermost_block API.
(do_one_display): Likewise.
* rust-exp.y (do_one_display): Likewise.
* symfile.c (clear_symtab_users): Likewise.
* varobj.c (varobj_create): Switch to innermost_block API, replace
use of innermost_block with block stored on varobj object.
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index ab10838..3ff7169 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -3507,9 +3507,7 @@ resolve_subexp (expression_up *expp, int *pos, int deprocedure_p, exp->elts[pc + 1].block = candidates[i].block; exp->elts[pc + 2].symbol = candidates[i].symbol; - if (innermost_block == NULL - || contained_in (candidates[i].block, innermost_block)) - innermost_block = candidates[i].block; + innermost_block.update (candidates[i]); } if (deprocedure_p @@ -3554,9 +3552,7 @@ resolve_subexp (expression_up *expp, int *pos, int deprocedure_p, exp->elts[pc + 4].block = candidates[i].block; exp->elts[pc + 5].symbol = candidates[i].symbol; - if (innermost_block == NULL - || contained_in (candidates[i].block, innermost_block)) - innermost_block = candidates[i].block; + innermost_block.update (candidates[i]); } } break; |