From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.50.73]) by sourceware.org (Postfix) with ESMTPS id 28DDC385E006 for ; Wed, 25 Mar 2020 20:14:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 28DDC385E006 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 8A1C64DCB6B for ; Wed, 25 Mar 2020 15:07:17 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HCJ3jkb0q8vkBHCJ3jaakD; Wed, 25 Mar 2020 15:07:17 -0500 X-Authority-Reason: nr=8 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=yxtTJyHHN+7eujJeL9RLyzSmJjmzNRlCMYsGeYhEkPQ=; b=GD2uWV0bmUIp5rG4Ytvov+Ui80 TyWgyYECTYjPuR84rdb/dO9M3VsFyCKW9lEyJgIrnbpDQRiRE/nymcII/XV5uMNsZjR8NIfxi2JQf gENB5Er3OkznKZcCf8R/drd6I; Received: from 97-118-117-21.hlrn.qwest.net ([97.118.117.21]:38026 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1jHCJ3-001VYp-Bb; Wed, 25 Mar 2020 14:07:17 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 01/10] Convert symbol_set_demangled_name to a method Date: Wed, 25 Mar 2020 14:07:06 -0600 Message-Id: <20200325200715.12947-2-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200325200715.12947-1-tom@tromey.com> References: <20200325200715.12947-1-tom@tromey.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.118.117.21 X-Source-L: No X-Exim-ID: 1jHCJ3-001VYp-Bb X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-117-21.hlrn.qwest.net (bapiya.Home) [97.118.117.21]:38026 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-24.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 20:14:11 -0000 This changes symbol_set_demangled_name to be a method on general_symbol_info, and updates the users. gdb/ChangeLog 2020-03-25 Tom Tromey * symtab.h (struct general_symbol_info) : New method. (symbol_set_demangled_name): Don't declare. * symtab.c (general_symbol_info::set_demangled_name): Rename from symbol_set_demangled_name. (general_symbol_info::set_language) (general_symbol_info::compute_and_set_names): Update. * minsyms.c (minimal_symbol_reader::install): Update. * dwarf2/read.c (new_symbol): Update. --- gdb/ChangeLog | 12 ++++++++++++ gdb/dwarf2/read.c | 4 +--- gdb/minsyms.c | 5 ++--- gdb/symtab.c | 27 ++++++++++++--------------- gdb/symtab.h | 9 +++++---- 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 0e879e08a0c..69ad352b6a7 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -20573,9 +20573,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, between gfortran, iFort etc. */ if (cu->language == language_fortran && symbol_get_demangled_name (sym) == NULL) - symbol_set_demangled_name (sym, - dwarf2_full_name (name, die, cu), - NULL); + sym->set_demangled_name (dwarf2_full_name (name, die, cu), NULL); /* Default assumptions. Use the passed type or decode it from the die. */ diff --git a/gdb/minsyms.c b/gdb/minsyms.c index e238355dc11..0bccf44f8ee 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -1418,9 +1418,8 @@ minimal_symbol_reader::install () /* This will be freed later, by compute_and_set_names. */ char *demangled_name = symbol_find_demangled_name (msym, msym->linkage_name ()); - symbol_set_demangled_name - (msym, demangled_name, - &m_objfile->per_bfd->storage_obstack); + msym->set_demangled_name + (demangled_name, &m_objfile->per_bfd->storage_obstack); msym->name_set = 1; } /* This mangled_name_hash computation has to be outside of diff --git a/gdb/symtab.c b/gdb/symtab.c index f300d759e03..84ad17ee50e 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -667,29 +667,27 @@ gdb_mangle_name (struct type *type, int method_id, int signature_id) return (mangled_name); } -/* Set the demangled name of GSYMBOL to NAME. NAME must be already - correctly allocated. */ +/* See symtab.h. */ void -symbol_set_demangled_name (struct general_symbol_info *gsymbol, - const char *name, - struct obstack *obstack) +general_symbol_info::set_demangled_name (const char *name, + struct obstack *obstack) { - if (gsymbol->language () == language_ada) + if (language () == language_ada) { if (name == NULL) { - gsymbol->ada_mangled = 0; - gsymbol->language_specific.obstack = obstack; + ada_mangled = 0; + language_specific.obstack = obstack; } else { - gsymbol->ada_mangled = 1; - gsymbol->language_specific.demangled_name = name; + ada_mangled = 1; + language_specific.demangled_name = name; } } else - gsymbol->language_specific.demangled_name = name; + language_specific.demangled_name = name; } /* Return the demangled name of GSYMBOL. */ @@ -722,7 +720,7 @@ general_symbol_info::set_language (enum language language, || language == language_objc || language == language_fortran) { - symbol_set_demangled_name (this, NULL, obstack); + set_demangled_name (NULL, obstack); } else if (language == language_ada) { @@ -872,7 +870,7 @@ general_symbol_info::compute_and_set_names (gdb::string_view linkage_name, m_name = obstack_strndup (&per_bfd->storage_obstack, linkage_name.data (), linkage_name.length ()); - symbol_set_demangled_name (this, NULL, &per_bfd->storage_obstack); + set_demangled_name (NULL, &per_bfd->storage_obstack); return; } @@ -962,8 +960,7 @@ general_symbol_info::compute_and_set_names (gdb::string_view linkage_name, m_language = (*slot)->language; m_name = (*slot)->mangled.data (); - symbol_set_demangled_name (this, (*slot)->demangled.get (), - &per_bfd->storage_obstack); + set_demangled_name ((*slot)->demangled.get (), &per_bfd->storage_obstack); } /* See symtab.h. */ diff --git a/gdb/symtab.h b/gdb/symtab.h index 18be5d51b85..83938d064fe 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -425,6 +425,11 @@ struct general_symbol_info void set_linkage_name (const char *linkage_name) { m_name = linkage_name; } + /* Set the demangled name of this symbol to NAME. NAME must be + already correctly allocated. If the symbol's language is Ada, + then the name is ignored and the obstack is set. */ + void set_demangled_name (const char *name, struct obstack *obstack); + enum language language () const { return m_language; } @@ -508,10 +513,6 @@ struct general_symbol_info short section; }; -extern void symbol_set_demangled_name (struct general_symbol_info *, - const char *, - struct obstack *); - extern const char *symbol_get_demangled_name (const struct general_symbol_info *); -- 2.17.2