diff mbox series

[09/30] Use block_symbol::address in linespec.c

Message ID	20231029-split-objfile-2023-bound-sym-october-v1-9-612531df2734@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 033DC38618F4 From: Tom Tromey <tom@tromey.com> Date: Sun, 29 Oct 2023 17:23:30 -0600 Subject: [PATCH 09/30] Use block_symbol::address in linespec.c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231029-split-objfile-2023-bound-sym-october-v1-9-612531df2734@tromey.com> References: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@tromey.com> In-Reply-To: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@tromey.com> To: gdb-patches@sourceware.org Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org
Series	Baby step for objfile splitting \| [00/30] Baby step for objfile splitting [01/30] Introduce block-symbol.h [02/30] Add block_symbol::address [03/30] Easy conversions to use block_symbol::address [04/30] Use block_symbol::address in ada-tasks.c [05/30] Use block_symbol::address in printcmd.c [06/30] Use block_symbol::address in tracepoint.c [07/30] More use of block_symbol::address in tracepoint.c [08/30] Use block_symbol::address in ax-gdb.c [09/30] Use block_symbol::address in linespec.c [10/30] Use block_symbol::address in ada-lang.c [11/30] Use block_symbol::address in symmisc.c [12/30] Introduce read_var_value overload [13/30] Use read_var_value in gdb/compile [14/30] Return a block_symbol from find_pc_sect_function [15/30] Use read_var_value overload in finish_command_fsm [16/30] Use block_symbol in overload-handling code [17/30] Change evaluate_var_value to accept a block_symbol [18/30] Change value_of_variable to take a block_symbol [19/30] Return a block_symbol from get_frame_function [20/30] Use read_var_value overload in return_command [21/30] Use read_var_value overload in py-finishbreakpoint.c [22/30] Use read_var_value overload in py-framefilter.c [23/30] Use read_var_value overload in Guile [24/30] Use read_var_value in read_frame_arg and read_frame_local [25/30] Change print_variable_and_value to take a block_symbol [26/30] Change find_frame_funname to return a block_symbol [27/30] Change btrace_function::sym to a block_symbol [28/30] Use read_var_value overload in Python [29/30] Remove the old read_var_value [30/30] Change language_defn::read_var_value to accept block_symbol

Commit Message

Tom Tromey Oct. 29, 2023, 11:23 p.m. UTC

  This changes linespec.c to use block_symbol::address.
---
 gdb/linespec.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/gdb/linespec.c b/gdb/linespec.c
index fa733d880e3..a118a20cade 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -383,7 +383,7 @@  static struct line_offset
 			      const char *variable);
 
 static int symbol_to_sal (struct symtab_and_line *result,
-			  int funfirstline, struct symbol *sym);
+			  int funfirstline, block_symbol sym);
 
 static void add_matching_symbols_to_info (const char *name,
 					  symbol_name_match_type name_match_type,
@@ -2187,7 +2187,7 @@  convert_linespec_to_sals (struct linespec_state *state, linespec *ls)
 	  struct program_space *pspace
 	    = sym.symbol->symtab ()->compunit ()->objfile ()->pspace;
 
-	  if (symbol_to_sal (&sal, state->funfirstline, sym.symbol)
+	  if (symbol_to_sal (&sal, state->funfirstline, sym)
 	      && maybe_add_address (state->addr_set, pspace, sal.pc))
 	    add_sal_to_sals (state, &sals, &sal,
 			     sym.symbol->natural_name (), 0);
@@ -2252,7 +2252,7 @@  convert_linespec_to_sals (struct linespec_state *state, linespec *ls)
 	      if (!found_ifunc)
 		{
 		  symtab_and_line sal;
-		  if (symbol_to_sal (&sal, state->funfirstline, sym.symbol)
+		  if (symbol_to_sal (&sal, state->funfirstline, sym)
 		      && maybe_add_address (state->addr_set, pspace, sal.pc))
 		    add_sal_to_sals (state, &sals, &sal,
 				     sym.symbol->natural_name (), 0);
@@ -4358,8 +4358,9 @@  add_matching_symbols_to_info (const char *name,
 
 static int
 symbol_to_sal (struct symtab_and_line *result,
-	       int funfirstline, struct symbol *sym)
+	       int funfirstline, block_symbol bsym)
 {
+  symbol *sym = bsym.symbol;
   if (sym->aclass () == LOC_BLOCK)
     {
       *result = find_function_start_sal (sym, funfirstline);
@@ -4367,13 +4368,13 @@  symbol_to_sal (struct symtab_and_line *result,
     }
   else
     {
-      if (sym->aclass () == LOC_LABEL && sym->value_address () != 0)
+      if (sym->aclass () == LOC_LABEL && bsym.address () != 0)
 	{
 	  *result = {};
 	  result->symtab = sym->symtab ();
 	  result->symbol = sym;
 	  result->line = sym->line ();
-	  result->pc = sym->value_address ();
+	  result->pc = bsym.address ();
 	  result->pspace = result->symtab->compunit ()->objfile ()->pspace;
 	  result->explicit_pc = 1;
 	  return 1;
@@ -4389,7 +4390,7 @@  symbol_to_sal (struct symtab_and_line *result,
 	  result->symtab = sym->symtab ();
 	  result->symbol = sym;
 	  result->line = sym->line ();
-	  result->pc = sym->value_address ();
+	  result->pc = bsym.address ();
 	  result->pspace = result->symtab->compunit ()->objfile ()->pspace;
 	  return 1;
 	}