From patchwork Sun Mar 11 05:19:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 26276 Received: (qmail 29308 invoked by alias); 11 Mar 2018 05:20:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 29240 invoked by uid 89); 11 Mar 2018 05:20:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=management X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.108) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 11 Mar 2018 05:20:03 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 44519785FDB for ; Sat, 10 Mar 2018 23:20:02 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id utOsekiHp7OvoutOse87nw; Sat, 10 Mar 2018 23:20:02 -0600 Received: from 174-29-60-18.hlrn.qwest.net ([174.29.60.18]:34876 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eutOs-001lC8-0R; Sat, 10 Mar 2018 23:20:02 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 1/2] Remove cleanup from build_type_psymtabs_1 Date: Sat, 10 Mar 2018 22:19:58 -0700 Message-Id: <20180311051959.17114-2-tom@tromey.com> In-Reply-To: <20180311051959.17114-1-tom@tromey.com> References: <20180311051959.17114-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1eutOs-001lC8-0R X-Source-Sender: 174-29-60-18.hlrn.qwest.net (bapiya.Home) [174.29.60.18]:34876 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes This removes a cleanup from build_type_psymtabs_1, by using std::vector rather than manual memory management. gdb/ChangeLog 2018-03-10 Tom Tromey * dwarf2read.c (sort_tu_by_abbrev_offset): Change to be suitable for use by std::sort. (build_type_psymtabs_1): Use std::vector. --- gdb/ChangeLog | 6 ++++++ gdb/dwarf2read.c | 29 +++++++++-------------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 5827ab446c..bbeb76ca70 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -8610,19 +8610,13 @@ struct tu_abbrev_offset sect_offset abbrev_offset; }; -/* Helper routine for build_type_psymtabs_1, passed to qsort. */ +/* Helper routine for build_type_psymtabs_1, passed to std::sort. */ -static int -sort_tu_by_abbrev_offset (const void *ap, const void *bp) +static bool +sort_tu_by_abbrev_offset (const struct tu_abbrev_offset &a, + const struct tu_abbrev_offset &b) { - const struct tu_abbrev_offset * const *a - = (const struct tu_abbrev_offset * const*) ap; - const struct tu_abbrev_offset * const *b - = (const struct tu_abbrev_offset * const*) bp; - sect_offset aoff = (*a)->abbrev_offset; - sect_offset boff = (*b)->abbrev_offset; - - return (aoff > boff) - (aoff < boff); + return a.abbrev_offset < b.abbrev_offset; } /* Efficiently read all the type units. @@ -8647,10 +8641,8 @@ static void build_type_psymtabs_1 (struct dwarf2_per_objfile *dwarf2_per_objfile) { struct tu_stats *tu_stats = &dwarf2_per_objfile->tu_stats; - struct cleanup *cleanups; abbrev_table_up abbrev_table; sect_offset abbrev_offset; - struct tu_abbrev_offset *sorted_by_abbrev; int i; /* It's up to the caller to not call us multiple times. */ @@ -8683,8 +8675,8 @@ build_type_psymtabs_1 (struct dwarf2_per_objfile *dwarf2_per_objfile) /* Sort in a separate table to maintain the order of all_type_units for .gdb_index: TU indices directly index all_type_units. */ - sorted_by_abbrev = XNEWVEC (struct tu_abbrev_offset, - dwarf2_per_objfile->n_type_units); + std::vector sorted_by_abbrev + (dwarf2_per_objfile->n_type_units); for (i = 0; i < dwarf2_per_objfile->n_type_units; ++i) { struct signatured_type *sig_type = dwarf2_per_objfile->all_type_units[i]; @@ -8695,9 +8687,8 @@ build_type_psymtabs_1 (struct dwarf2_per_objfile *dwarf2_per_objfile) sig_type->per_cu.section, sig_type->per_cu.sect_off); } - cleanups = make_cleanup (xfree, sorted_by_abbrev); - qsort (sorted_by_abbrev, dwarf2_per_objfile->n_type_units, - sizeof (struct tu_abbrev_offset), sort_tu_by_abbrev_offset); + std::sort (sorted_by_abbrev.begin (), sorted_by_abbrev.end (), + sort_tu_by_abbrev_offset); abbrev_offset = (sect_offset) ~(unsigned) 0; @@ -8720,8 +8711,6 @@ build_type_psymtabs_1 (struct dwarf2_per_objfile *dwarf2_per_objfile) init_cutu_and_read_dies (&tu->sig_type->per_cu, abbrev_table.get (), 0, 0, build_type_psymtabs_reader, NULL); } - - do_cleanups (cleanups); } /* Print collected type unit statistics. */