From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 86690 invoked by alias); 15 Feb 2020 16:55:01 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 85866 invoked by uid 89); 15 Feb 2020 16:54:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.125) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 15 Feb 2020 16:54:50 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 49FE329872 for ; Sat, 15 Feb 2020 10:54:49 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 30iPj1bGI8vkB30iPjyzzu; Sat, 15 Feb 2020 10:54:49 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+HUBJZP7t6dqZyFBUkZtzVSex5dRkOPP9aBhUGMB4XA=; b=TOopxAnX+cdaioBHIYO/+n6W61 +Za+3LgqNiWImb7qjm+/9ACwIJFHbgrKaHpaW9O5fPugO84LuxwEIdDq/W0r4RxZ7+HSPRzMy3Roz T1m2DA6/5QWxsv6bKuUm4d2bW; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:45240 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1j30iP-000xcC-1G; Sat, 15 Feb 2020 09:54:49 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 11/14] Split type_unit_group Date: Sat, 15 Feb 2020 16:55:00 -0000 Message-Id: <20200215165444.32653-12-tom@tromey.com> In-Reply-To: <20200215165444.32653-1-tom@tromey.com> References: <20200215165444.32653-1-tom@tromey.com> X-SW-Source: 2020-02/txt/msg00597.txt.bz2 type_unit_group has links to the compunit_symtab and other symtabs. However, once this object is shared across objfiles, this will no longer be ok. This patch introduces a new type_unit_unshareable and arranges to store a map from type unit groups to type_unit_unshareable objects on the DWARF unshareable object. 2020-02-15 Tom Tromey * dwarf2/read.h (struct type_unit_unshareable): New. (struct dwarf2_unshareable) : New member. * dwarf2/read.c (struct type_unit_group) : Remove; move to type_unit_unshareable. (get_type_unit_group_unshareable): New function. (process_full_type_unit, dwarf2_cu::setup_type_unit_groups) (dwarf2_cu::setup_type_unit_groups): Use type_unit_unshareable. --- gdb/ChangeLog | 10 ++++++++ gdb/dwarf2/read.c | 65 +++++++++++++++++++++++++---------------------- gdb/dwarf2/read.h | 30 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 31 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index f86034f2273..d1c5bee1109 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -580,27 +580,8 @@ struct type_unit_group and is deleted afterwards and not used again. */ std::vector *tus; - /* The compunit symtab. - Type units in a group needn't all be defined in the same source file, - so we create an essentially anonymous symtab as the compunit symtab. */ - struct compunit_symtab *compunit_symtab; - /* The data used to construct the hash key. */ struct stmt_list_hash hash; - - /* The number of symtabs from the line header. - The value here must match line_header.num_file_names. */ - unsigned int num_symtabs; - - /* The symbol tables for this TU (obtained from the files listed in - DW_AT_stmt_list). - WARNING: The order of entries here must match the order of entries - in the line header. After the first TU using this type_unit_group, the - line header for the subsequent TUs is recreated from this. This is done - because we need to use the same symtabs for each TU using the same - DW_AT_stmt_list value. Also note that symtabs may be repeated here, - there's no guarantee the line header doesn't have duplicate entries. */ - struct symtab **symtabs; }; /* These sections are what may appear in a (real or virtual) DWO file. */ @@ -9507,6 +9488,22 @@ rust_union_quirks (struct dwarf2_cu *cu) cu->rust_unions.clear (); } +/* Get the type_unit_unshareable corresponding to TU_GROUP. If one + does not exist, create it. */ + +static type_unit_unshareable * +get_type_unit_group_unshareable (dwarf2_per_objfile *dwarf2_per_objfile, + type_unit_group *tu_group) +{ + auto iter = dwarf2_per_objfile->unshareable->type_units.find (tu_group); + if (iter != dwarf2_per_objfile->unshareable->type_units.end ()) + return iter->second.get (); + std::unique_ptr uniq (new type_unit_unshareable); + type_unit_unshareable *result = uniq.get (); + dwarf2_per_objfile->unshareable->type_units[tu_group] = std::move (uniq); + return result; +} + /* Return the symtab for PER_CU. This works properly regardless of whether we're using the index or psymtabs. */ @@ -9776,11 +9773,14 @@ process_full_type_unit (struct dwarf2_per_cu_data *per_cu, If this is the first TU to use this symtab, complete the construction of it with end_expandable_symtab. Otherwise, complete the addition of this TU's symbols to the existing symtab. */ - if (sig_type->type_unit_group->compunit_symtab == NULL) + type_unit_unshareable *tu_unshare + = get_type_unit_group_unshareable (dwarf2_per_objfile, + sig_type->type_unit_group); + if (tu_unshare->compunit_symtab == NULL) { buildsym_compunit *builder = cu->get_builder (); cust = builder->end_expandable_symtab (0, SECT_OFF_TEXT (objfile)); - sig_type->type_unit_group->compunit_symtab = cust; + tu_unshare->compunit_symtab = cust; if (cust != NULL) { @@ -9796,7 +9796,7 @@ process_full_type_unit (struct dwarf2_per_cu_data *per_cu, else { cu->get_builder ()->augment_type_symtab (); - cust = sig_type->type_unit_group->compunit_symtab; + cust = tu_unshare->compunit_symtab; } gdb::optional &symtab @@ -10930,7 +10930,10 @@ dwarf2_cu::setup_type_unit_groups (struct die_info *die) do it again, we could fake it and just recreate the part we need (file name,index -> symtab mapping). If data shows this optimization is useful we can do it then. */ - first_time = tu_group->compunit_symtab == NULL; + struct dwarf2_per_objfile *dwarf2_per_objfile = per_cu->dwarf2_per_objfile; + type_unit_unshareable *tu_unshare + = get_type_unit_group_unshareable (dwarf2_per_objfile, tu_group); + first_time = tu_unshare->compunit_symtab == NULL; /* We have to handle the case of both a missing DW_AT_stmt_list or bad debug info. */ @@ -10946,9 +10949,9 @@ dwarf2_cu::setup_type_unit_groups (struct die_info *die) start_symtab ("", NULL, 0); else { - gdb_assert (tu_group->symtabs == NULL); + gdb_assert (tu_unshare->symtabs == NULL); gdb_assert (m_builder == nullptr); - struct compunit_symtab *cust = tu_group->compunit_symtab; + struct compunit_symtab *cust = tu_unshare->compunit_symtab; m_builder.reset (new struct buildsym_compunit (COMPUNIT_OBJFILE (cust), "", COMPUNIT_DIRNAME (cust), @@ -10970,9 +10973,9 @@ dwarf2_cu::setup_type_unit_groups (struct die_info *die) process_full_type_unit still needs to know if this is the first time. */ - tu_group->num_symtabs = line_header->file_names_size (); - tu_group->symtabs = XNEWVEC (struct symtab *, - line_header->file_names_size ()); + tu_unshare->num_symtabs = line_header->file_names_size (); + tu_unshare->symtabs = XNEWVEC (struct symtab *, + line_header->file_names_size ()); auto &file_names = line_header->file_names (); for (i = 0; i < file_names.size (); ++i) @@ -10993,13 +10996,13 @@ dwarf2_cu::setup_type_unit_groups (struct die_info *die) } fe.symtab = b->get_current_subfile ()->symtab; - tu_group->symtabs[i] = fe.symtab; + tu_unshare->symtabs[i] = fe.symtab; } } else { gdb_assert (m_builder == nullptr); - struct compunit_symtab *cust = tu_group->compunit_symtab; + struct compunit_symtab *cust = tu_unshare->compunit_symtab; m_builder.reset (new struct buildsym_compunit (COMPUNIT_OBJFILE (cust), "", COMPUNIT_DIRNAME (cust), @@ -11010,7 +11013,7 @@ dwarf2_cu::setup_type_unit_groups (struct die_info *die) for (i = 0; i < file_names.size (); ++i) { file_entry &fe = file_names[i]; - fe.symtab = tu_group->symtabs[i]; + fe.symtab = tu_unshare->symtabs[i]; } } diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index bef37e969d3..8b2e8703aa0 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -47,6 +47,7 @@ struct dwarf2_per_cu_data; struct mapped_index; struct mapped_debug_names; struct signatured_type; +struct type_unit_group; /* One item on the queue of compilation units to read in full symbols for. */ @@ -66,6 +67,30 @@ struct dwarf2_queue_item enum language pretend_language; }; +/* This is the per-objfile data associated with a type_unit_group. */ + +struct type_unit_unshareable +{ + /* The compunit symtab. + Type units in a group needn't all be defined in the same source file, + so we create an essentially anonymous symtab as the compunit symtab. */ + struct compunit_symtab *compunit_symtab = nullptr; + + /* The number of symtabs from the line header. + The value here must match line_header.num_file_names. */ + unsigned int num_symtabs = 0; + + /* The symbol tables for this TU (obtained from the files listed in + DW_AT_stmt_list). + WARNING: The order of entries here must match the order of entries + in the line header. After the first TU using this type_unit_group, the + line header for the subsequent TUs is recreated from this. This is done + because we need to use the same symtabs for each TU using the same + DW_AT_stmt_list value. Also note that symtabs may be repeated here, + there's no guarantee the line header doesn't have duplicate entries. */ + struct symtab **symtabs = nullptr; +}; + /* Some DWARF data cannot (currently) be shared across objfiles. Such data is stored in this object. @@ -86,6 +111,11 @@ struct dwarf2_unshareable /* Hold the corresponding compunit_symtab for each CU or TU. This is indexed by dwarf2_per_cu_data::index. */ std::vector> symtabs; + + /* Map from a type unit group to the corresponding unshared + structure. */ + std::unordered_map> + type_units; }; /* Collection of data recorded per objfile. -- 2.17.2