From: Tom Tromey Date: Mon, 17 May 2021 18:50:33 +0000 (-0600) Subject: Replace sort_tu_by_abbrev_offset with operator< X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=16e0020bfc845d87f2f3584414c4efa2454f8d05;p=binutils-gdb.git Replace sort_tu_by_abbrev_offset with operator< 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. 2021-05-17 Tom Tromey * dwarf2/read.c (tu_abbrev_offset::operator<): New method. (sort_tu_by_abbrev_offset): Remove. (build_type_psymtabs): Update. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0014d75fbb8..b4fd2bb69f0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2021-05-17 Tom Tromey + + * dwarf2/read.c (tu_abbrev_offset::operator<): New method. + (sort_tu_by_abbrev_offset): Remove. + (build_type_psymtabs): Update. + 2021-05-17 Simon Marchi * py-project.toml: New. 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;