From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id fMfqE6V6GmkBuQoAWB0awg (envelope-from ) for ; Sun, 16 Nov 2025 20:30:13 -0500 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=HXhuYHzh; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 3E2731E0AB; Sun, 16 Nov 2025 20:30:13 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.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 ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 058751E08D for ; Sun, 16 Nov 2025 20:30:11 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E62813858C56 for ; Mon, 17 Nov 2025 01:30:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E62813858C56 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=HXhuYHzh Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 176BF3858C78 for ; Mon, 17 Nov 2025 01:28:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 176BF3858C78 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 176BF3858C78 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1763342910; cv=none; b=aMe/+ooNoWRFKhL7TnNk8KjaWpMGpZ3q0yNPBCzWRyKGZjeTIGDSm7Ioqp9JPYwUmSdKgRBTGCGBzV+o8+OoDaPh/U84RafQO5jNg29vDOSBX9+eu+MhEIinBPypqHeldbLsLe4EJYgjnv7fudCMzj7m04ddoDho3jlVYpXodas= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1763342910; c=relaxed/simple; bh=6WwTlBwtEY/c2Iw6CaUQwz0qmFg5vlWxzvoZ2/jLP+w=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=hxUf6aPeY9UipqKP6DnhUMhRNO2LZ/W76n3OmEp70zd+3RALDW8Rh98S/Ex5SsOag/pKiDktBTOxjzeyEU04U6k3bIWkhG8Sf9vhx9EIcplkPRI2szjP2mewlySJUCE5nVt1I1QQb3YC7RYnlwizXx72RU4EwgMpDSp0tCiaBAU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 176BF3858C78 Received: from eig-obgw-6002b.ext.cloudfilter.net ([10.0.30.203]) by cmsmtp with ESMTPS id KlmbvtZB5ipkCKo2fvjMlB; Mon, 17 Nov 2025 01:28:29 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id Ko2evLmS4vr5uKo2evFskr; Mon, 17 Nov 2025 01:28:28 +0000 X-Authority-Analysis: v=2.4 cv=a7kw9VSF c=1 sm=1 tr=0 ts=691a7a3c a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=6UeiqGixMTsA:10 a=ItBw4LHWJt0A:10 a=KrCQoA9-h-mOjtZQ4TIA:9 a=VS4QxaUSPT0UtbFnIvSC:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=wSpHX5lIj1GDBB8uutmflb2XJpmRqU5VUeqxAiDEtGg=; b=HXhuYHzhhUPAVF34g/zamjPfEE BctEqOQjHfeT6dcUAaA9ytAGr+hj9OoE1zC4gS+0JtdOPnz0RJPhfwv3uBgqJ8CvMr93uwTb3yNEt QxnDO2yn2eKAU1S/moPW1O/fp; Received: from 97-122-120-205.hlrn.qwest.net ([97.122.120.205]:41170 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vKo2V-00000000Q3v-2CaZ; Sun, 16 Nov 2025 18:28:19 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/7] Rename lookup_struct_typedef Date: Sun, 16 Nov 2025 18:27:03 -0700 Message-ID: <20251117012752.2657208-5-tom@tromey.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20251117012752.2657208-1-tom@tromey.com> References: <20251117012752.2657208-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.122.120.205 X-Source-L: No X-Exim-ID: 1vKo2V-00000000Q3v-2CaZ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-120-205.hlrn.qwest.net (localhost.localdomain) [97.122.120.205]:41170 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfECH0INA7DRMVZf3KYttgjFg0DMsauAZpwGjuW45bB7LwXSW7+4MKtpzZ4E6lHdN+TqU4Y1siyvyL3mjjqbtxhiNYZnm0Rc6LnIfnPphSyaPB1WmWRQI AWVeL7E9kxwvx+yeNx1qLuezNONIYTaAHZNXXOVYJ5v8NBPXRNo5aqZWiP/l+SoGoec600tGHgj8Jh+DRB4sBb1ju7pskkZlOlE= X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org The helper function lookup_struct_typedef is only ever called with "noerr=1". This patch removes the parameter, changes the name, and removes some unnecessary code. --- gdb/c-exp.y | 4 ++-- gdb/objc-lang.c | 31 +++++++------------------------ gdb/objc-lang.h | 5 ++--- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 9f1cb1b2e2a..6dd2b0800dd 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -3167,8 +3167,8 @@ classify_name (struct parser_state *par_state, const struct block *block, struct symbol *sym; yylval.theclass.theclass = Class; - sym = lookup_struct_typedef (copy.c_str (), - par_state->expression_context_block, 1); + sym = lookup_struct_noerr (copy.c_str (), + par_state->expression_context_block); if (sym) yylval.theclass.type = sym->type (); return CLASSNAME; diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index b6f42b982eb..b307a0022b5 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -79,31 +79,14 @@ struct objc_method { static const registry::key objc_objfile_data; /* Lookup a structure type named "struct NAME", visible in lexical - block BLOCK. If NOERR is nonzero, return zero if NAME is not - suitably defined. */ + block BLOCK. Return nullptr if no such type is found. */ struct symbol * -lookup_struct_typedef (const char *name, const struct block *block, int noerr) +lookup_struct_noerr (const char *name, const struct block *block) { - struct symbol *sym; - - sym = lookup_symbol (name, block, SEARCH_STRUCT_DOMAIN, 0).symbol; - - if (sym == NULL) - { - if (noerr) - return 0; - else - error (_("No struct type named %s."), name); - } - if (sym->type ()->code () != TYPE_CODE_STRUCT) - { - if (noerr) - return 0; - else - error (_("This context has class, union or enum %s, not a struct."), - name); - } + symbol *sym = lookup_symbol (name, block, SEARCH_STRUCT_DOMAIN, 0).symbol; + if (sym == nullptr || sym->type ()->code () != TYPE_CODE_STRUCT) + return nullptr; return sym; } @@ -212,9 +195,9 @@ value_nsstring (struct gdbarch *gdbarch, const char *ptr, int len) else error (_("NSString: internal error -- no way to create new NSString")); - sym = lookup_struct_typedef("NSString", 0, 1); + sym = lookup_struct_noerr ("NSString", 0); if (sym == NULL) - sym = lookup_struct_typedef("NXString", 0, 1); + sym = lookup_struct_noerr ("NXString", 0); if (sym == NULL) type = builtin_type (gdbarch)->builtin_data_ptr; else diff --git a/gdb/objc-lang.h b/gdb/objc-lang.h index ec6fbe7aaf9..d6a7509f21a 100644 --- a/gdb/objc-lang.h +++ b/gdb/objc-lang.h @@ -44,8 +44,7 @@ extern void start_msglist (void); extern void add_msglist (struct stoken *str, int addcolon); extern int end_msglist (struct parser_state *); -struct symbol *lookup_struct_typedef (const char *name, - const struct block *block, - int noerr); +struct symbol *lookup_struct_noerr (const char *name, + const struct block *block); #endif /* GDB_OBJC_LANG_H */ -- 2.49.0