From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id +X0LKWDLy2mzwQAAWB0awg (envelope-from ) for ; Tue, 31 Mar 2026 09:25:52 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1ZFS6ll2; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ceJ1CMgD; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1ZFS6ll2; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ceJ1CMgD; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A2AE11E0BC; Tue, 31 Mar 2026 09:25:52 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,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 vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 117FA1E04F for ; Tue, 31 Mar 2026 09:25:52 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id A15E24BA23E5 for ; Tue, 31 Mar 2026 13:25:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A15E24BA23E5 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1ZFS6ll2; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ceJ1CMgD; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=1ZFS6ll2; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ceJ1CMgD Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id B76464BB58EC for ; Tue, 31 Mar 2026 13:23:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B76464BB58EC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B76464BB58EC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774963423; cv=none; b=DjYgF2Vjgo+wk4jsmY2ocX7xk81r9x0hm0xPRSQJOa6014YBrrk8h0sdXGYEhXRjhc4mmdGi0cRVl0oSMaIJzWG4oELENtI+N98Lz9MUIB5rH6fzmmpUa1E2LPxwML3ygZBtnhEYl6tebLvAjkkQDAELVKPZ9Gob5vaenV+5Duc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774963423; c=relaxed/simple; bh=iHpo4i8p5sOZeKf5u1NpIjRe2deY9qhernUl6pIelAk=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=DdahgrBWiHQQLzqFjkIhiMSDEhUZY8LiLRvJKAAZwFZ33dPDmNFssTuqSlg9YfbMCjcSFBGLiCt2j3ePKwpEm45mpxbg9IzFEY9NlM8vIGJs834Ck+tH+YszNCkIN/LduwuQKOaZDw+L5TxE+9h8H7v1NRlUALW4LDJ3FHTPJtQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B76464BB58EC Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id AA2984D25C for ; Tue, 31 Mar 2026 13:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HO55/f1a8fjLaAiCTMigezemutSa527gQa91blwToq8=; b=1ZFS6ll2osM/Yh92t3Mmg5wzX4IQAzGFVRaC6OE1J7Ik9HKR7Zdxgm5N7QMvSx1fcfU+X6 2o6+1hDu+DBiz/RcRSL1w/mhN+wXuBXT/mIBbZNvs0lfNxVouqzNu06tdoIY18259E2Y6m 2ebY4W2bHkuwAbgR8OlZkHexY/eqR24= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HO55/f1a8fjLaAiCTMigezemutSa527gQa91blwToq8=; b=ceJ1CMgD6/oKgUl0Nyd2z1Iet59ZDyqdfTSGN4BgWJ5UbTJCeH9dVTO22a+RksM5tCEhnv 6L3jX/5Jb6gSoVCg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=1ZFS6ll2; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=ceJ1CMgD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HO55/f1a8fjLaAiCTMigezemutSa527gQa91blwToq8=; b=1ZFS6ll2osM/Yh92t3Mmg5wzX4IQAzGFVRaC6OE1J7Ik9HKR7Zdxgm5N7QMvSx1fcfU+X6 2o6+1hDu+DBiz/RcRSL1w/mhN+wXuBXT/mIBbZNvs0lfNxVouqzNu06tdoIY18259E2Y6m 2ebY4W2bHkuwAbgR8OlZkHexY/eqR24= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774963422; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HO55/f1a8fjLaAiCTMigezemutSa527gQa91blwToq8=; b=ceJ1CMgD6/oKgUl0Nyd2z1Iet59ZDyqdfTSGN4BgWJ5UbTJCeH9dVTO22a+RksM5tCEhnv 6L3jX/5Jb6gSoVCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 91F114A0B0 for ; Tue, 31 Mar 2026 13:23:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iGlzIt7Ky2moUwAAD6G6ig (envelope-from ) for ; Tue, 31 Mar 2026 13:23:42 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [RFC v2 1/3] [gdb/symtab] Add find_symbol_for_pc_maybe_inline Date: Tue, 31 Mar 2026 15:23:40 +0200 Message-ID: <20260331132342.1050954-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260331132342.1050954-1-tdevries@suse.de> References: <20260331132342.1050954-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, suse.de:mid, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: AA2984D25C 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 We have function find_symbol_for_pc: ... find_symbol_for_pc (CORE_ADDR pc) { return find_symbol_for_pc_sect (pc, find_pc_mapped_section (pc)); } ... which uses some standard way of getting the section for the given pc. Add a similar function find_symbol_for_pc_maybe_inline that calls find_symbol_for_pc_sect_maybe_inline, and use it in jump_command. Tested on x86_64-linux. --- gdb/blockframe.c | 8 ++++++++ gdb/infcmd.c | 3 +-- gdb/symtab.h | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 59efa391604..ce28d99c7e4 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -152,6 +152,14 @@ find_symbol_for_pc (CORE_ADDR pc) /* See symtab.h. */ +struct symbol * +find_symbol_for_pc_maybe_inline (CORE_ADDR pc) +{ + return find_symbol_for_pc_sect_maybe_inline (pc, find_pc_mapped_section (pc)); +} + +/* See symtab.h. */ + struct symbol * find_symbol_for_pc_sect_maybe_inline (CORE_ADDR pc, struct obj_section *section) { diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 9fbee5aaba7..2e1a4d592c1 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1249,8 +1249,7 @@ jump_command (const char *arg, int from_tty) /* See if we are trying to jump to another function. */ fn = get_frame_function (get_current_frame ()); - sfn = find_symbol_for_pc_sect_maybe_inline (sal.pc, - find_pc_mapped_section (sal.pc)); + sfn = find_symbol_for_pc_maybe_inline (sal.pc); if (fn != nullptr && sfn != fn) { if (!query (_("Line %ps is not in `%ps'. Jump anyway? "), diff --git a/gdb/symtab.h b/gdb/symtab.h index 8f0cc728410..132058a0065 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2201,6 +2201,12 @@ extern struct type *lookup_enum (const char *, const struct block *); extern struct symbol *find_symbol_for_pc (CORE_ADDR); +/* Lookup the function symbol corresponding to the address. The return value + will be the closest enclosing function, which might be an inline + function. */ + +extern struct symbol *find_symbol_for_pc_maybe_inline (CORE_ADDR pc); + /* lookup the function corresponding to the address and section. The return value will not be an inlined function; the containing function will be returned instead. */ -- 2.51.0