diff mbox series

[04/30] Use block_symbol::address in ada-tasks.c

Message ID	20231029-split-objfile-2023-bound-sym-october-v1-4-612531df2734@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 76272386181F From: Tom Tromey <tom@tromey.com> Date: Sun, 29 Oct 2023 17:23:25 -0600 Subject: [PATCH 04/30] Use block_symbol::address in ada-tasks.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-4-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 ada-tasks.c to use block_symbol::address.
---
 gdb/ada-tasks.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Simon Marchi Nov. 3, 2023, 3:40 a.m. UTC | #1

On 2023-10-29 19:23, Tom Tromey wrote:
> This changes ada-tasks.c to use block_symbol::address.
> ---
>  gdb/ada-tasks.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
> index 047566e6228..9f2d670e71e 100644
> --- a/gdb/ada-tasks.c
> +++ b/gdb/ada-tasks.c
> @@ -914,7 +914,7 @@ static void
>  ada_tasks_inferior_data_sniffer (struct ada_tasks_inferior_data *data)
>  {
>    struct bound_minimal_symbol msym;
> -  struct symbol *sym;
> +  struct block_symbol sym;

I'd suggest declaring separate sym variables in the two scopes where
it's needed (ideally where it's initialized).  This helps show that the
two uses are not related and specific to those scopes.

Simon

Tom Tromey Nov. 5, 2023, 4:35 p.m. UTC | #2

>>>>> "Simon" == Simon Marchi <simark@simark.ca> writes:

>> struct bound_minimal_symbol msym;
>> -  struct symbol *sym;
>> +  struct block_symbol sym;

Simon> I'd suggest declaring separate sym variables in the two scopes where
Simon> it's needed (ideally where it's initialized).  This helps show that the
Simon> two uses are not related and specific to those scopes.

I made this change.

Tom

diff mbox series

Patch

diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 047566e6228..9f2d670e71e 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -914,7 +914,7 @@  static void
 ada_tasks_inferior_data_sniffer (struct ada_tasks_inferior_data *data)
 {
   struct bound_minimal_symbol msym;
-  struct symbol *sym;
+  struct block_symbol sym;
 
   /* Return now if already set.  */
   if (data->known_tasks_kind != ADA_TASKS_UNKNOWN)
@@ -930,11 +930,11 @@  ada_tasks_inferior_data_sniffer (struct ada_tasks_inferior_data *data)
 
       /* Try to get pointer type and array length from the symtab.  */
       sym = lookup_symbol_in_language (KNOWN_TASKS_NAME, NULL, VAR_DOMAIN,
-				       language_c, NULL).symbol;
-      if (sym != NULL)
+				       language_c, NULL);
+      if (sym.symbol != nullptr)
 	{
 	  /* Validate.  */
-	  struct type *type = check_typedef (sym->type ());
+	  struct type *type = check_typedef (sym.symbol->type ());
 	  struct type *eltype = NULL;
 	  struct type *idxtype = NULL;
 
@@ -976,11 +976,11 @@  ada_tasks_inferior_data_sniffer (struct ada_tasks_inferior_data *data)
       data->known_tasks_length = 1;
 
       sym = lookup_symbol_in_language (KNOWN_TASKS_LIST, NULL, VAR_DOMAIN,
-				       language_c, NULL).symbol;
-      if (sym != NULL && sym->value_address () != 0)
+				       language_c, NULL);
+      if (sym.symbol != nullptr && sym.address () != 0)
 	{
 	  /* Validate.  */
-	  struct type *type = check_typedef (sym->type ());
+	  struct type *type = check_typedef (sym.symbol->type ());
 
 	  if (type->code () == TYPE_CODE_PTR)
 	    {