Re: [PATCH] Replace sort_tu_by_abbrev_offset with operator<

[Simon Marchi <simon.marchi@polymtl.ca>]

On 2021-05-15 11:19 a.m., Tom Tromey wrote:
> I noticed that sort_tu_by_abbrev_offset only has a single caller.  It
> seemed simpler to replace it with an implementation of operator<
> instead.
> 
> gdb/ChangeLog
> 2021-05-15  Tom Tromey  <tom@tromey.com>
> 
> 	* dwarf2/read.c (tu_abbrev_offset::operator<): New method.
> 	(sort_tu_by_abbrev_offset): Remove.
> 	(build_type_psymtabs): Update.
> ---
>  gdb/ChangeLog     |  6 ++++++
>  gdb/dwarf2/read.c | 18 +++++++-----------
>  2 files changed, 13 insertions(+), 11 deletions(-)
> 
> diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
> index ac786abf6d2..f1bb9b2f3df 100644
> --- a/gdb/dwarf2/read.c
> +++ b/gdb/dwarf2/read.c
> @@ -7351,19 +7351,16 @@ struct tu_abbrev_offset
>    : sig_type (sig_type_), abbrev_offset (abbrev_offset_)
>    {}
>  
> +  /* This is used when sorting.  */
> +  bool operator< (const tu_abbrev_offset &other)
> +  {
> +    return abbrev_offset < other.abbrev_offset;
> +  }
> +
>    signatured_type *sig_type;
>    sect_offset abbrev_offset;
>  };
>  
> -/* Helper routine for build_type_psymtabs, passed to std::sort.  */
> -
> -static bool
> -sort_tu_by_abbrev_offset (const struct tu_abbrev_offset &a,
> -			  const struct tu_abbrev_offset &b)
> -{
> -  return a.abbrev_offset < b.abbrev_offset;
> -}
> -
>  /* Efficiently read all the type units.
>  
>     The efficiency is because we sort TUs by the abbrev table they use and
> @@ -7431,8 +7428,7 @@ build_type_psymtabs (dwarf2_per_objfile *per_objfile)
>  	}
>      }
>  
> -  std::sort (sorted_by_abbrev.begin (), sorted_by_abbrev.end (),
> -	     sort_tu_by_abbrev_offset);
> +  std::sort (sorted_by_abbrev.begin (), sorted_by_abbrev.end ());
>  
>    abbrev_offset = (sect_offset) ~(unsigned) 0;
>  
> 

LGTM, thanks.

Simon