From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id P44SAhsvT2ebvwIAWB0awg (envelope-from ) for ; Tue, 03 Dec 2024 11:17:31 -0500 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=gIhTYEAK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=46IFuULh; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=wnmfWE3a; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=yrkRLDPc; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id EE6291E0BB; Tue, 3 Dec 2024 11:17:30 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.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 autolearn=ham autolearn_force=no version=4.0.0 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 1C5321E092 for ; Tue, 3 Dec 2024 11:17:30 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A9E6F3858C56 for ; Tue, 3 Dec 2024 16:17:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A9E6F3858C56 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=gIhTYEAK; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=46IFuULh; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=wnmfWE3a; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=yrkRLDPc Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 390603858D33 for ; Tue, 3 Dec 2024 16:16:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 390603858D33 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 390603858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1733242580; cv=none; b=oTNhzsaY1QtCjtB+AI07CfZd7rl/8OoYyzYAzfzizu90a0pAJQWm+8dK+Y1rxVve7cO5eRGsAh8A1OLNDdGpz2PjuIlYbN/MoiSzNJu744abJMy2g85XbojBKhUzNkaTdZkcmFJrSAjKquthKOvkrZnIMXizEow5PuhGWgCyo54= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1733242580; c=relaxed/simple; bh=4i8mpzHbqYV8K4n06c2NH747G040b/i05jSbXaCpmBs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:To:From; b=HHj22FvzpT8JjGFcmg7hhklb2Pl3gnrObl/xAKnllIWVwgbfId4/CsPWGdjLhR023j7LCC7S4nvu7gnsFnOCioeEyPn/mntGCWgT5jNUk+jZ+z2SY1CZR2Q7Oja1puGPEOG4Pqn+Q9G/ZjC0IqKAYeL4Kx1PiTByDLtFh2XuwzA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 390603858D33 Received: from imap1.dmz-prg2.suse.org (unknown [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-out2.suse.de (Postfix) with ESMTPS id 05ADA1F45E; Tue, 3 Dec 2024 16:16:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1733242579; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=scYe7H1jjlJOmfzdihFV+TN8YhPrsCWiI6cDG7bUjk8=; b=gIhTYEAKZoCQPCPGx9E6nUdTES9luUek3Gj28Q7ubRMKOLWmZgTGUsLNBXaygIHRdg62B6 8JisG7B1dFiYb532mvK6yKvAy2ocr9E24zWwKlTjUScUg26ES6InQvltVhdqkiJ6317OiO BE1H+qsnAycMj/TfkFuRh5Dk/rjXe30= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1733242579; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=scYe7H1jjlJOmfzdihFV+TN8YhPrsCWiI6cDG7bUjk8=; b=46IFuULhWox0bCb+KSji6qIJxErJv0IYcrR+UN3ebGZnu3BYO6JJZ794OOZMva7xuS3qfo oWdFkdoxZaepHSAA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1733242578; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=scYe7H1jjlJOmfzdihFV+TN8YhPrsCWiI6cDG7bUjk8=; b=wnmfWE3amUldv0N9Y6SaSmQFthHbjwoJdeWwggbk8nR3E49ocPcIzMvYIN7/qGZMucP5rD DDPMWssljGsseujqxXU/dRHWUu6uj+MV+fombd5HsJlT7/aLBXGoFALzJjZwdznFe3MXdu JNuRfb0OcGGkTAm0BdD3riYB9PO0cSg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1733242578; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=scYe7H1jjlJOmfzdihFV+TN8YhPrsCWiI6cDG7bUjk8=; b=yrkRLDPcKiAD1tVZ4Kd0qS8JLh3IX2uXatHGLzDCLtm3+P9AnHEH/tH8fEsr6ulESyAcF5 EX4vkjkMqC6JzVDA== 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 E486313A15; Tue, 3 Dec 2024 16:16:17 +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 dY+MNtEuT2fhVwAAD6G6ig (envelope-from ); Tue, 03 Dec 2024 16:16:17 +0000 Message-ID: <423ec6a9-f6ba-4461-8223-cde3211532a0@suse.de> Date: Tue, 3 Dec 2024 17:17:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] gdb: restore nullptr check in compunit_symtab::find_call_site To: Simon Marchi , gdb-patches@sourceware.org References: <20241203155223.10203-1-simon.marchi@efficios.com> Content-Language: en-US From: Tom de Vries In-Reply-To: <20241203155223.10203-1-simon.marchi@efficios.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url,suse.de:mid,suse.de:email] 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 On 12/3/24 16:52, Simon Marchi wrote: > Commit de2b4ab50de ("Convert dwarf2_cu::call_site_htab to new hash > table") removed this nullptr check for no good reason. This causes a > crash if `m_call_site_htab` is not set, as shown in PR 32410. My guess > is that when doing this change, I tried to make `m_call_site_htab` not a > pointer, removed this check, then realized it wasn't so obvious, and > forgot to re-add the check. > Hi Simon, thanks for the quick fix. I've tested it with the test-case on which the PR was reported, and gdb no longer crashes. The test-case still produces two FAILs, but that looks unrelated. LGTM. Approved-By: Tom de Vries Thanks, - Tom > Change-Id: I455e00cdc0519dfb412dc7826d17a839b77aae69 > Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32410 > --- > gdb/symtab.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/gdb/symtab.c b/gdb/symtab.c > index edc19ff5c155..30c22dcea38c 100644 > --- a/gdb/symtab.c > +++ b/gdb/symtab.c > @@ -396,6 +396,9 @@ linetable_entry::pc (const struct objfile *objfile) const > call_site * > compunit_symtab::find_call_site (CORE_ADDR pc) const > { > + if (m_call_site_htab == nullptr) > + return nullptr; > + > CORE_ADDR delta = this->objfile ()->text_section_offset (); > > if (auto it = m_call_site_htab->find (static_cast (pc - delta)); > > base-commit: d556cf2ec79ed5afbbdd523484954c6a520b5b73