From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id AC1293858D28 for ; Mon, 17 Apr 2023 21:24:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC1293858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 199FD10040634 for ; Mon, 17 Apr 2023 21:24:27 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id oWKop55tnj9SgoWKop3dQP; Mon, 17 Apr 2023 21:24:27 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=LP+j/La9 c=1 sm=1 tr=0 ts=643db90b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=F9BTJ5PyKWJp5qFjScwA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version: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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=dyELbgEDdVdRGFvtxzyPXtD3X4jkoxFHmK8V+CQDpSY=; b=lBB5ap94N4wH53V0Qh3yKuY7xO U7wLJUqE4G3miZQef0qV57DDO1BndfDYRcv19oT9oby5NZV8blQ1pRZZxK1lgbKEsdkkC0/DzqGUJ 4Vek0pPXjPZSqhqCDLJTGclYW; Received: from 71-211-191-82.hlrn.qwest.net ([71.211.191.82]:37214 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1poWKo-002VgB-Le; Mon, 17 Apr 2023 15:24:26 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Remove parameter from select_source_symtab Date: Mon, 17 Apr 2023 15:24:17 -0600 Message-Id: <20230417212417.486279-1-tom@tromey.com> X-Mailer: git-send-email 2.39.2 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: 71.211.191.82 X-Source-L: No X-Exim-ID: 1poWKo-002VgB-Le X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-191-82.hlrn.qwest.net (localhost.localdomain) [71.211.191.82]:37214 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: I noticed that select_source_symtab is only ever called with nullptr as an argument, so this patch removes the parameter and associated logic. --- gdb/source.c | 16 ++++------------ gdb/source.h | 14 ++++++-------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gdb/source.c b/gdb/source.c index 4d297c82ea9..98d02d45448 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -266,7 +266,7 @@ set_default_source_symtab_and_line (void) /* Pull in a current source symtab if necessary. */ current_source_location *loc = get_source_location (current_program_space); if (loc->symtab () == nullptr) - select_source_symtab (0); + select_source_symtab (); } /* Return the current default file for listing and next line to list @@ -307,16 +307,8 @@ clear_current_source_symtab_and_line (void) /* See source.h. */ void -select_source_symtab (struct symtab *s) +select_source_symtab () { - if (s) - { - current_source_location *loc - = get_source_location (s->compunit ()->objfile ()->pspace); - loc->set (s, 1); - return; - } - current_source_location *loc = get_source_location (current_program_space); if (loc->symtab () != nullptr) return; @@ -363,7 +355,7 @@ select_source_symtab (struct symtab *s) for (objfile *objfile : current_program_space->objfiles ()) { - s = objfile->find_last_source_symtab (); + symtab *s = objfile->find_last_source_symtab (); if (s) new_symtab = s; } @@ -1617,7 +1609,7 @@ search_command_helper (const char *regex, int from_tty, bool forward) current_source_location *loc = get_source_location (current_program_space); if (loc->symtab () == nullptr) - select_source_symtab (0); + select_source_symtab (); if (!source_open) error (_("source code access disabled")); diff --git a/gdb/source.h b/gdb/source.h index d3e612ceaa1..8fbc365680d 100644 --- a/gdb/source.h +++ b/gdb/source.h @@ -202,13 +202,11 @@ extern void print_source_lines (struct symtab *s, source_lines_range r, may be found in a different directory now. */ extern void forget_cached_source_info (void); -/* Set the source file default for the "list" command to be S. - - If S is NULL, and we don't have a default, find one. This - should only be called when the user actually tries to use the - default, since we produce an error if we can't find a reasonable - default. Also, since this can cause symbols to be read, doing it - before we need to would make things slower than necessary. */ -extern void select_source_symtab (struct symtab *s); +/* Find a source file default for the "list" command. This should + only be called when the user actually tries to use the default, + since we produce an error if we can't find a reasonable default. + Also, since this can cause symbols to be read, doing it before we + need to would make things slower than necessary. */ +extern void select_source_symtab (); #endif -- 2.39.2