diff options
author | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-06-01 22:17:59 +0100 |
---|---|---|
committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-06-17 09:25:12 +0100 |
commit | a78a19b15254de31c3d38b7e27469aaef0a30e97 (patch) | |
tree | 0fe1497b95f1c0c554eaabbfd170fdd949562a70 /gdb/symtab.c | |
parent | ebe2334ee6cb065d2a86688bc9558d62320dd459 (diff) | |
download | binutils-a78a19b15254de31c3d38b7e27469aaef0a30e97.zip binutils-a78a19b15254de31c3d38b7e27469aaef0a30e97.tar.gz binutils-a78a19b15254de31c3d38b7e27469aaef0a30e97.tar.bz2 |
gdb: Convert language la_lookup_symbol_nonlocal field to a method
This commit changes the language_data::la_lookup_symbol_nonlocal
function pointer member variable into a member function of
language_defn.
There should be no user visible changes after this commit.
gdb/ChangeLog:
* ada-lang.c (ada_lookup_symbol_nonlocal): Rename to
ada_language::lookup_symbol_nonlocal.
(ada_language_data): Delete la_lookup_symbol_nonlocal initializer.
(ada_language::lookup_symbol_nonlocal): New member function,
implementation from ada_lookup_symbol_nonlocal.
* c-lang.c (c_language_data): Delete la_lookup_symbol_nonlocal
initializer.
(cplus_language_data): Delete la_lookup_symbol_nonlocal
initializer.
(cplus_language::lookup_symbol_nonlocal): New member function.
(asm_language_data): Delete la_lookup_symbol_nonlocal initializer.
(minimal_language_data) Likewise.
* cp-namespace.c (cp_lookup_nested_symbol): Update comment.
* d-lang.c (d_language_data): Delete la_lookup_symbol_nonlocal
initializer.
(d_language::lookup_symbol_nonlocal): New member function.
* f-lang.c (f_language_data): Delete la_lookup_symbol_nonlocal
initializer.
(f_language::lookup_symbol_nonlocal): New member function.
* go-lang.c (go_language_data): Delete la_lookup_symbol_nonlocal
initializer.
* language.c (unknown_language_data): Likewise.
(auto_language_data): Likewise.
* language.h (language_data): Delete la_lookup_symbol_nonlocal
field.
(language_defn::lookup_symbol_nonlocal): New member function.
* m2-lang.c (m2_language_data): Delete la_lookup_symbol_nonlocal
initializer.
* objc-lang.c (objc_language_data): Likewise.
* opencl-lang.c (opencl_language_data): Likewise.
* p-lang.c (pascal_language_data): Likewise.
* rust-lang.c (rust_lookup_symbol_nonlocal): Rename to
rust_language::lookup_symbol_nonlocal.
(rust_language_data): Delete la_lookup_symbol_nonlocal
initializer.
(rust_language::lookup_symbol_nonlocal): New member function,
implementation from rust_lookup_symbol_nonlocal.
* symtab.c (lookup_symbol_aux): Update call to
lookup_symbol_nonlocal.
(basic_lookup_symbol_nonlocal): Rename to...
(language_defn::lookup_symbol_nonlocal): ...this, and update
header comment. Remove language_defn parameter, and replace with
uses of `this'.
* symtab.h (basic_lookup_symbol_nonlocal): Delete declaration.
Diffstat (limited to 'gdb/symtab.c')
-rw-r--r-- | gdb/symtab.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gdb/symtab.c b/gdb/symtab.c index b0e22ee..19f078e 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2086,7 +2086,7 @@ lookup_symbol_aux (const char *name, symbol_name_match_type match_type, /* Now do whatever is appropriate for LANGUAGE to look up static and global variables. */ - result = langdef->la_lookup_symbol_nonlocal (langdef, name, block, domain); + result = langdef->lookup_symbol_nonlocal (name, block, domain); if (result.symbol != NULL) { if (symbol_lookup_debug) @@ -2401,13 +2401,12 @@ lookup_symbol_via_quick_fns (struct objfile *objfile, return result; } -/* See symtab.h. */ +/* See language.h. */ struct block_symbol -basic_lookup_symbol_nonlocal (const struct language_defn *langdef, - const char *name, - const struct block *block, - const domain_enum domain) +language_defn::lookup_symbol_nonlocal (const char *name, + const struct block *block, + const domain_enum domain) const { struct block_symbol result; @@ -2433,7 +2432,7 @@ basic_lookup_symbol_nonlocal (const struct language_defn *langdef, gdbarch = target_gdbarch (); else gdbarch = block_gdbarch (block); - result.symbol = language_lookup_primitive_type_as_symbol (langdef, + result.symbol = language_lookup_primitive_type_as_symbol (this, gdbarch, name); result.block = NULL; if (result.symbol != NULL) |