From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id oKEvApjo82EjewAAWB0awg (envelope-from ) for ; Fri, 28 Jan 2022 07:59:04 -0500 Received: by simark.ca (Postfix, from userid 112) id 05C101F3B7; Fri, 28 Jan 2022 07:59:04 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 4B5051EE18 for ; Fri, 28 Jan 2022 07:59:03 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E49D23947424 for ; Fri, 28 Jan 2022 12:59:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E49D23947424 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643374742; bh=9/H7Gp45i/sDeuXgv1jA2d/Bmya4zLNBc05kV7X5UUs=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=CY5Yr4c+wI1uepQi+Cx/o/79xKVBn3vIu5hDCKm04uAzYn7QQnTN+p4h6mms6QswO 7POPSEcgewzWpTqLDTIb6g+TZLu+US4sYlZ3+6aRQ/GbA14rquJEVjg2gPeGKHaS3F ALDf/Dd2LSKorfHijZ5ZtlthY2GqeQxUC1S7bi/w= Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 614BA38515FF for ; Fri, 28 Jan 2022 12:51:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 614BA38515FF X-ASG-Debug-ID: 1643374294-0c856e06ab271d80001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id BakWkI6MSDGwyGoW (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 28 Jan 2022 07:51:34 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id E6809441D64; Fri, 28 Jan 2022 07:51:33 -0500 (EST) X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [PATCH 28/33] gdb: remove SYMBOL_OBJFILE_OWNED macro Date: Fri, 28 Jan 2022 07:45:26 -0500 X-ASG-Orig-Subj: [PATCH 28/33] gdb: remove SYMBOL_OBJFILE_OWNED macro Message-Id: <20220128124531.2302941-29-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220128124531.2302941-1-simon.marchi@polymtl.ca> References: <20220128124531.2302941-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1643374294 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 7888 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.95629 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M 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: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Cc: Simon Marchi Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" From: Simon Marchi Add a getter and a setter for whether a symbol is objfile owned. Remove the corresponding macro and adjust all callers. Change-Id: Ib7ef3718d65553ae924ca04c3fd478b0f4f3147c --- gdb/ada-lang.c | 4 ++-- gdb/guile/scm-symbol.c | 4 ++-- gdb/language.c | 2 +- gdb/printcmd.c | 2 +- gdb/python/py-symbol.c | 6 +++--- gdb/symmisc.c | 2 +- gdb/symtab.c | 10 +++++----- gdb/symtab.h | 15 ++++++++++++--- 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index dd1be6045639..77d6c07c6a9e 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -3352,7 +3352,7 @@ See set/show multiple-symbol.")); && SYMBOL_TYPE (syms[i].symbol)->code () == TYPE_CODE_ENUM); struct symtab *symtab = NULL; - if (SYMBOL_OBJFILE_OWNED (syms[i].symbol)) + if (syms[i].symbol->is_objfile_owned ()) symtab = symbol_symtab (syms[i].symbol); if (SYMBOL_LINE (syms[i].symbol) != 0 && symtab != NULL) @@ -4376,7 +4376,7 @@ cache_symbol (const char *name, domain_enum domain, struct symbol *sym, /* Symbols for builtin types don't have a block. For now don't cache such symbols. */ - if (sym != NULL && !SYMBOL_OBJFILE_OWNED (sym)) + if (sym != NULL && !sym->is_objfile_owned ()) return; /* If the symbol is a local symbol, then do not cache it, as a search diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c index 9816a90a8dd8..caad90f46785 100644 --- a/gdb/guile/scm-symbol.c +++ b/gdb/guile/scm-symbol.c @@ -101,7 +101,7 @@ syscm_get_symbol_map (struct symbol *symbol) { htab_t htab; - if (SYMBOL_OBJFILE_OWNED (symbol)) + if (symbol->is_objfile_owned ()) { struct objfile *objfile = symbol_objfile (symbol); @@ -362,7 +362,7 @@ gdbscm_symbol_symtab (SCM self) = syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct symbol *symbol = s_smob->symbol; - if (!SYMBOL_OBJFILE_OWNED (symbol)) + if (!symbol->is_objfile_owned ()) return SCM_BOOL_F; return stscm_scm_from_symtab (symbol_symtab (symbol)); } diff --git a/gdb/language.c b/gdb/language.c index b33ff7ff0da3..1d4b1b312525 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -998,7 +998,7 @@ language_arch_info::type_and_symbol::alloc_type_symbol symbol->m_name = type->name (); symbol->set_language (lang, nullptr); symbol->owner.arch = gdbarch; - SYMBOL_OBJFILE_OWNED (symbol) = 0; + symbol->set_is_objfile_owned (0); symbol->set_section_index (0); SYMBOL_TYPE (symbol) = type; symbol->set_domain (VAR_DOMAIN); diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 0b0a1d63a81e..787d8d771284 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1686,7 +1686,7 @@ info_address_command (const char *exp, int from_tty) puts_filtered (sym->print_name ()); printf_filtered ("\" is "); val = SYMBOL_VALUE (sym); - if (SYMBOL_OBJFILE_OWNED (sym)) + if (sym->is_objfile_owned ()) section = sym->obj_section (symbol_objfile (sym)); else section = NULL; diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index fe62809c19b2..708474331d72 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -88,7 +88,7 @@ sympy_get_symtab (PyObject *self, void *closure) SYMPY_REQUIRE_VALID (self, symbol); - if (!SYMBOL_OBJFILE_OWNED (symbol)) + if (!symbol->is_objfile_owned ()) Py_RETURN_NONE; return symtab_to_symtab_object (symbol_symtab (symbol)); @@ -302,7 +302,7 @@ set_symbol (symbol_object *obj, struct symbol *symbol) { obj->symbol = symbol; obj->prev = NULL; - if (SYMBOL_OBJFILE_OWNED (symbol) + if (symbol->is_objfile_owned () && symbol_symtab (symbol) != NULL) { struct objfile *objfile = symbol_objfile (symbol); @@ -348,7 +348,7 @@ sympy_dealloc (PyObject *obj) if (sym_obj->prev) sym_obj->prev->next = sym_obj->next; else if (sym_obj->symbol != NULL - && SYMBOL_OBJFILE_OWNED (sym_obj->symbol) + && sym_obj->symbol->is_objfile_owned () && symbol_symtab (sym_obj->symbol) != NULL) { set_objfile_data (symbol_objfile (sym_obj->symbol), diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 9bba067a07f8..cb16b5c202b5 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -502,7 +502,7 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol, { struct obj_section *section; - if (SYMBOL_OBJFILE_OWNED (symbol)) + if (symbol->is_objfile_owned ()) section = symbol->obj_section (symbol_objfile (symbol)); else section = NULL; diff --git a/gdb/symtab.c b/gdb/symtab.c index 5e4a461deb92..8bdc6cab9608 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1789,7 +1789,7 @@ fixup_symbol_section (struct symbol *sym, struct objfile *objfile) if (!sym) return NULL; - if (!SYMBOL_OBJFILE_OWNED (sym)) + if (!sym->is_objfile_owned ()) return sym; /* We either have an OBJFILE, or we can get at it from the sym's @@ -6534,7 +6534,7 @@ initialize_ordinary_address_classes (void) struct objfile * symbol_objfile (const struct symbol *symbol) { - gdb_assert (SYMBOL_OBJFILE_OWNED (symbol)); + gdb_assert (symbol->is_objfile_owned ()); return symbol->owner.symtab->objfile (); } @@ -6543,7 +6543,7 @@ symbol_objfile (const struct symbol *symbol) struct gdbarch * symbol_arch (const struct symbol *symbol) { - if (!SYMBOL_OBJFILE_OWNED (symbol)) + if (!symbol->is_objfile_owned ()) return symbol->owner.arch; return symbol->owner.symtab->objfile ()->arch (); } @@ -6553,7 +6553,7 @@ symbol_arch (const struct symbol *symbol) struct symtab * symbol_symtab (const struct symbol *symbol) { - gdb_assert (SYMBOL_OBJFILE_OWNED (symbol)); + gdb_assert (symbol->is_objfile_owned ()); return symbol->owner.symtab; } @@ -6562,7 +6562,7 @@ symbol_symtab (const struct symbol *symbol) void symbol_set_symtab (struct symbol *symbol, struct symtab *symtab) { - gdb_assert (SYMBOL_OBJFILE_OWNED (symbol)); + gdb_assert (symbol->is_objfile_owned ()); symbol->owner.symtab = symtab; } diff --git a/gdb/symtab.h b/gdb/symtab.h index 2825697fc192..ef9e653dfad2 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1115,7 +1115,7 @@ struct symbol : public general_symbol_info, public allocate_on_obstack /* Class-initialization of bitfields is only allowed in C++20. */ : m_domain (UNDEF_DOMAIN), m_aclass_index (0), - is_objfile_owned (1), + m_is_objfile_owned (1), is_argument (0), is_inlined (0), maybe_copied (0), @@ -1168,6 +1168,16 @@ struct symbol : public general_symbol_info, public allocate_on_obstack m_domain = domain; } + bool is_objfile_owned () const + { + return m_is_objfile_owned; + } + + void set_is_objfile_owned (bool is_objfile_owned) + { + m_is_objfile_owned = is_objfile_owned; + } + /* Data type of value */ struct type *type = nullptr; @@ -1199,7 +1209,7 @@ struct symbol : public general_symbol_info, public allocate_on_obstack /* If non-zero then symbol is objfile-owned, use owner.symtab. Otherwise symbol is arch-owned, use owner.arch. */ - unsigned int is_objfile_owned : 1; + unsigned int m_is_objfile_owned : 1; /* Whether this is an argument. */ @@ -1270,7 +1280,6 @@ struct block_symbol /* Note: There is no accessor macro for symbol.owner because it is "private". */ -#define SYMBOL_OBJFILE_OWNED(symbol) ((symbol)->is_objfile_owned) #define SYMBOL_IS_ARGUMENT(symbol) (symbol)->is_argument #define SYMBOL_INLINED(symbol) (symbol)->is_inlined #define SYMBOL_IS_CPLUS_TEMPLATE_FUNCTION(symbol) \ -- 2.34.1