Re: [PATCH 5/6] Return void from buildsym_compunit::push_context

[Simon Marchi <simark@simark.ca>]

On 4/17/26 2:24 PM, Tom Tromey wrote:
> diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
> index 4447923ae3e..2a330655c48 100644
> --- a/gdb/dwarf2/read.c
> +++ b/gdb/dwarf2/read.c
> @@ -7799,10 +7799,11 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
>  	}
>      }
>  
> -  gdb_assert (cu->get_builder () != nullptr);
> -  context_stack &ctx = cu->get_builder ()->push_context (lowpc);
> +  buildsym_compunit *builder = cu->get_builder ();
> +  gdb_assert (builder != nullptr);
> +  builder->push_context (lowpc);
>    symbol *func_sym = new_symbol (die, read_type_die (die, cu), cu, templ_func);
> -  ctx.name = func_sym;
> +  builder->set_current_context_function (func_sym);

It might be tricky depending on how new_symbol uses the current context
when reading a DW_TAG_subprogram, but I wonder if we could call
new_symbol first, then pass the resulting symbol to push_context.  Then
we wouldn't need to have a setter.  If that's possible, I think it would
be slightly better, because it would show that the symbol is initialized
when the context is pushed and can't change.  Other callers of
push_context would pass a nullptr symbol.

Simon