From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 8742A385840C for ; Fri, 2 Dec 2022 18:00:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8742A385840C Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2B2I0rvs020403 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 2 Dec 2022 13:00:58 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2B2I0rvs020403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1670004058; bh=DvracCLjLi+k+za7i9WJrBYZFFFHjfXGfSDn9ah1Mlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o05wvk5PvuOYWp2zg/qQle3DiLkiAvG4Dtua/cPWCBJ9vrBxl6flmB00LpG7+fhfQ PBpNuIIY/nOy31zN2cMo8PyfvLA8fYey+5rXB9hbF5rJGkSRVWC2QZrp+BhoXllsaO 2DvbIxc+exsqVOhNEwuVQPj13bwvO+V0BAgPnmSU= Received: from simark.localdomain (unknown [217.28.27.60]) (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 ESMTPSA id D59CD1E11E; Fri, 2 Dec 2022 13:00:53 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/6] gdb: add invalidate_selected_frame function Date: Fri, 2 Dec 2022 13:00:47 -0500 Message-Id: <20221202180052.212745-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221202180052.212745-1-simon.marchi@polymtl.ca> References: <20221202180052.212745-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 2 Dec 2022 18:00:53 +0000 X-Spam-Status: No, score=-3189.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP 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: Instead of using `select_frame (nullptr)` to invalidate the selected frame, introduce a function to do that. There is no change in behavior, but it makes the intent a bit clearer. It also allows adding an assert in select_frame that fi is not nullptr, so it avoids passing nullptr by mistake. Change-Id: I61643f46bc8eca428334513ebdaadab63997bdd0 --- gdb/frame.c | 16 ++++++++++++++-- gdb/frame.h | 3 +-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gdb/frame.c b/gdb/frame.c index b4079ef833e8..6a6d968b9a97 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1836,11 +1836,23 @@ deprecated_safe_get_selected_frame (void) return get_selected_frame (NULL); } -/* Select frame FI (or NULL - to invalidate the selected frame). */ +/* Invalidate the selected frame. */ + +static void +invalidate_selected_frame () +{ + selected_frame = nullptr; + selected_frame_level = -1; + selected_frame_id = null_frame_id; +} + +/* See frame.h. */ void select_frame (frame_info_ptr fi) { + gdb_assert (fi != nullptr); + selected_frame = fi; selected_frame_level = frame_relative_level (fi); if (selected_frame_level == 0) @@ -2012,7 +2024,7 @@ reinit_frame_cache (void) annotate_frames_invalid (); sentinel_frame = NULL; /* Invalidate cache */ - select_frame (NULL); + invalidate_selected_frame (); frame_stash_invalidate (); for (frame_info_ptr &iter : frame_info_ptr::frame_list) diff --git a/gdb/frame.h b/gdb/frame.h index 100ab1fe48eb..cf8bbc6a52bd 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -239,8 +239,7 @@ extern void reinit_frame_cache (void); and then return that thread's previously selected frame. */ extern frame_info_ptr get_selected_frame (const char *message = nullptr); -/* Select a specific frame. NULL implies re-select the inner most - frame. */ +/* Select a specific frame. */ extern void select_frame (frame_info_ptr); /* Save the frame ID and frame level of the selected frame in FRAME_ID -- 2.38.1