diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/ada-exp.y | 2 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 12 | ||||
| -rw-r--r-- | gdb/ada-lang.h | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d28471e..b1fa611 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-07-01 Tom Tromey <tromey@adacore.com> + + * ada-exp.y (find_primitive_type): Update. + * ada-lang.h (ada_lookup_symbol): Update. + * ada-lang.c (ada_lookup_symbol): Remove "is_a_field_of_this" + parameter. + (ada_lookup_encoded_symbol, ada_lookup_symbol_nonlocal): Update. + 2019-06-28 Sergio Durigan Junior <sergiodj@redhat.com> PR breakpoints/24541 diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index f7ce27a..2c8f3d6 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -1041,7 +1041,7 @@ find_primitive_type (struct parser_state *par_state, char *name) (char *) alloca (strlen (name) + sizeof ("standard__")); strcpy (expanded_name, "standard__"); strcat (expanded_name, name); - sym = ada_lookup_symbol (expanded_name, NULL, VAR_DOMAIN, NULL).symbol; + sym = ada_lookup_symbol (expanded_name, NULL, VAR_DOMAIN).symbol; if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF) type = SYMBOL_TYPE (sym); } diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 1e99655..332363b 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5778,22 +5778,18 @@ ada_lookup_encoded_symbol (const char *name, const struct block *block, std::string verbatim = std::string ("<") + name + '>'; gdb_assert (info != NULL); - *info = ada_lookup_symbol (verbatim.c_str (), block, domain, NULL); + *info = ada_lookup_symbol (verbatim.c_str (), block, domain); } /* Return a symbol in DOMAIN matching NAME, in BLOCK0 and enclosing scope and in global scopes, or NULL if none. NAME is folded and encoded first. Otherwise, the result is as for ada_lookup_symbol_list, - choosing the first symbol if there are multiple choices. - If IS_A_FIELD_OF_THIS is not NULL, it is set to zero. */ + choosing the first symbol if there are multiple choices. */ struct block_symbol ada_lookup_symbol (const char *name, const struct block *block0, - domain_enum domain, int *is_a_field_of_this) + domain_enum domain) { - if (is_a_field_of_this != NULL) - *is_a_field_of_this = 0; - std::vector<struct block_symbol> candidates; int n_candidates; @@ -5815,7 +5811,7 @@ ada_lookup_symbol_nonlocal (const struct language_defn *langdef, { struct block_symbol sym; - sym = ada_lookup_symbol (name, block_static_block (block), domain, NULL); + sym = ada_lookup_symbol (name, block_static_block (block), domain); if (sym.symbol != NULL) return sym; diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index ff6c339..b10c680 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -239,7 +239,7 @@ extern char *ada_fold_name (const char *); extern struct block_symbol ada_lookup_symbol (const char *, const struct block *, - domain_enum, int *); + domain_enum); extern void ada_lookup_encoded_symbol (const char *name, const struct block *block, domain_enum domain, |