diff options
| author | Tom Tromey <tromey@adacore.com> | 2023-01-13 09:27:54 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2023-02-08 08:20:12 -0700 |
| commit | dae58e04442670270fe116ff1f2e38a2b184b4a1 (patch) | |
| tree | 04e2d5d13c4f771bb1d717c322aa48f76b4e3376 /gdb/ada-lang.c | |
| parent | 5abbfa982215a5bcd2bf2c0b92cbb005464dc927 (diff) | |
| download | binutils-dae58e04442670270fe116ff1f2e38a2b184b4a1.zip binutils-dae58e04442670270fe116ff1f2e38a2b184b4a1.tar.gz binutils-dae58e04442670270fe116ff1f2e38a2b184b4a1.tar.bz2 | |
Remove most calls to fixup_symbol_section
Nearly every call to fixup_symbol_section in gdb is incorrect, and if
any such call has an effect, it's purely by happenstance.
fixup_section has a long comment explaining that the call should only
be made before runtime section offsets are applied. And, the loop in
this code (the fallback loop -- the minsym lookup code is "ok") is
careful to remove these offsets before comparing addresses.
However, aside from a single call in dwarf2/read.c, every call in gdb
is actually done after section offsets have been applied. So, these
calls are incorrect.
Now, these calls could be made when the symbol is created. I
considered this approach, but I reasoned that the code has been this
way for many years, seemingly without ill effect. So, instead I chose
to simply remove the offending calls.
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 40f8591..3cd6f73 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5389,9 +5389,7 @@ match_data::operator() (struct block_symbol *bsym) if (sym == NULL) { if (!found_sym && arg_sym != NULL) - add_defn_to_vec (*resultp, - fixup_symbol_section (arg_sym, objfile), - block); + add_defn_to_vec (*resultp, arg_sym, block); found_sym = false; arg_sym = NULL; } @@ -5404,9 +5402,7 @@ match_data::operator() (struct block_symbol *bsym) else { found_sym = true; - add_defn_to_vec (*resultp, - fixup_symbol_section (sym, objfile), - block); + add_defn_to_vec (*resultp, sym, block); } } return true; @@ -5808,9 +5804,7 @@ ada_lookup_symbol (const char *name, const struct block *block0, if (candidates.empty ()) return {}; - block_symbol info = candidates[0]; - info.symbol = fixup_symbol_section (info.symbol, NULL); - return info; + return candidates[0]; } @@ -6098,9 +6092,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result, else { found_sym = true; - add_defn_to_vec (result, - fixup_symbol_section (sym, objfile), - block); + add_defn_to_vec (result, sym, block); } } } @@ -6113,9 +6105,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result, if (!found_sym && arg_sym != NULL) { - add_defn_to_vec (result, - fixup_symbol_section (arg_sym, objfile), - block); + add_defn_to_vec (result, arg_sym, block); } if (!lookup_name.ada ().wild_match_p ()) @@ -6152,9 +6142,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result, else { found_sym = true; - add_defn_to_vec (result, - fixup_symbol_section (sym, objfile), - block); + add_defn_to_vec (result, sym, block); } } } @@ -6165,9 +6153,7 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result, They aren't parameters, right? */ if (!found_sym && arg_sym != NULL) { - add_defn_to_vec (result, - fixup_symbol_section (arg_sym, objfile), - block); + add_defn_to_vec (result, arg_sym, block); } } } |