Re: [PATCH 15/20] dwarf reader: drop (now) unused code related to symbol table reading

[Dodji Seketeli <dodji@seketeli.org>]

Hello,

Matthias Maennich <maennich@google.com> a écrit:

[...]

> diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
> index 6d4e8ae23c53..91451208ef11 100644
> --- a/src/abg-dwarf-reader.cc
> +++ b/src/abg-dwarf-reader.cc

[...]

>  /// Build a @ref var_decl out of a DW_TAG_variable DIE.
>  ///
>  /// @param ctxt the read context to use.
> @@ -14065,23 +13417,9 @@ build_var_decl(read_context&	ctxt,
>    if (!result->get_symbol())
>      {
>        elf_symbol_sptr var_sym;
> -      if (get_ignore_symbol_table(ctxt))
> -	{
> -	  string var_name =
> -	    result->get_linkage_name().empty()
> -	    ? result->get_name()
> -	    : result->get_linkage_name();
> -
> -	  var_sym = create_default_var_sym(var_name, ctxt.env());
> -	  ABG_ASSERT(var_sym);
> -	  add_symbol_to_map(var_sym, ctxt.var_syms());
> -	}
> -      else
> -	{
> -	  Dwarf_Addr var_addr;
> -	  if (ctxt.get_variable_address(die, var_addr))
> -	    var_sym = var_sym = ctxt.variable_symbol_is_exported(var_addr);
> -	}
> +      Dwarf_Addr      var_addr;
> +      if (ctxt.get_variable_address(die, var_addr))
> +	var_sym = var_sym = ctxt.variable_symbol_is_exported(var_addr);

It looks like there is one 'var_sym =' too many.

>  
>        if (var_sym)
>  	{

[...]

> The introduction of the new symtab reader incorporated much of the
> existing functionality. Now that the most code parts are migrated to the
> new symtab reader, we can safely remove the old code paths.
>
> Ignoring the symbol table is not a thing anymore. The new symtab reader
> does read the symtab unconditionally for consistency reasons. Hence also
> remove all functionality around conditional symtab reading.
>
> 	* include/abg-dwarf-reader.h (set_ignore_symbol_table): Remove.
> 	(get_ignore_symbol_table): Likewise.
> 	* src/abg-dwarf-reader.cc (add_symbol_to_map): Likewise.
> 	(read_context::options_type::ignore_symbol_table): Likewise.
> 	(read_context::options_type): Adjust.
> 	(read_context::fun_addr_sym_map_): Remove.
> 	(read_context::fun_entry_addr_sym_map_): Likewise.
> 	(read_context::fun_syms_): Likewise.
> 	(read_context::var_addr_sym_map_): Likewise.
> 	(read_context::var_syms_): Likewise.
> 	(read_context::undefined_fun_syms_): Likewise.
> 	(read_context::undefined_var_syms_): Likewise.
> 	(read_context::initialize): Adjust.
> 	(read_context::lookup_elf_symbol_from_index): Remove.
> 	(read_context::fun_entry_addr_sym_map_sptr): Likewise.
> 	(read_context::fun_entry_addr_sym_map): Likewise.
> 	(read_context::fun_syms_sptr): Likewise.
> 	(read_context::fun_syms): Likewise.
> 	(read_context::var_syms_sptr): Likewise.
> 	(read_context::var_syms): Likewise.
> 	(read_context::undefined_fun_syms_sptr): Likewise.
> 	(read_context::undefined_var_syms_sptr): Likewise.
> 	(read_context::load_symbol_maps_from_symtab_section): Likewise.
> 	(read_context::load_symbol_maps): Likewise.
> 	(read_context::maybe_load_symbol_maps): Likewise.
> 	(set_ignore_symbol_table): Likewise.
> 	(get_ignore_symbol_table): Likewise.
> 	(create_default_var_sym): Likewise.
> 	(build_var_decl): Adjust.
> 	(function_is_suppressed): Likewise.
> 	(variable_is_suppressed): Likewise.
> 	(build_function_decl): Likewise.
> 	(add_symbol_to_map): Remove.
> 	(read_corpus_from_elf): Adjust.
> 	(build_corpus_group_from_kernel_dist_under): Likewise.
> 	* tools/abidw.cc (main): Likewise.
>
> Reviewed-by: Giuliano Procida <gprocida@google.com>
> Signed-off-by: Matthias Maennich <maennich@google.com>

OK to apply to master with the above change once the prerequisite
patches have been applied.

Thanks!

[...]

Cheers,

-- 
		Dodji