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 83B1E38533C3 for ; Wed, 14 Dec 2022 03:46:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 83B1E38533C3 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 2BE3jtPQ032711 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 22:45:59 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2BE3jtPQ032711 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1670989560; bh=pP+zlGx41/AHdlOWEjMkeRxG7p1n7lva+YfmrB00Gzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bwd6zwgbueZDUXmpyoOMb1IuA4tny6f9/LANrcx8LQw9VQ/s1/toR6rIM63cfm4vY ezr3lxMg0By+GGAdECvT/4A+aERjXAYrnUVloRDArbQpJaDzBZX/a+UaSMAiJnXjDd 7RpgSz/xRw6SSw3wWLKNDtecd6VtYMB2rYaEKXAM= 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 9105A1E15D; Tue, 13 Dec 2022 22:36:45 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 13/13] gdb: make frame_info_ptr auto-reinflatable Date: Tue, 13 Dec 2022 22:34:41 -0500 Message-Id: <20221214033441.499512-14-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214033441.499512-1-simon.marchi@polymtl.ca> References: <20221214033441.499512-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 14 Dec 2022 03:45:55 +0000 X-Spam-Status: No, score=-3189.5 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: From: Simon Marchi This is the second step of making frame_info_ptr automatic, reinflate on demand whenever trying to obtain the wrapper frame_info pointer, either through the get method or operator->. Make the reinflate method private, it is used as a convenience method in those two. Add an "is_null" method, because it is often needed to know whether the frame_info_ptr wraps an frame_info or is empty. Make m_ptr mutable, so that it's possible to reinflate const frame_info_ptr objects. Whether m_ptr is nullptr or not does not change the logical state of the object, because we re-create it on demand. I believe this is the right use case for mutable. Change-Id: Icb0552d0035e227f81eb3c121d8a9bb2f9d25794 --- gdb/frame.c | 7 ++-- gdb/frame.h | 45 +++++++++++++++++------- gdb/infcmd.c | 1 - gdb/mi/mi-cmd-stack.c | 1 - gdb/stack.c | 6 ---- gdb/unittests/frame_info_ptr-selftests.c | 2 -- 6 files changed, 36 insertions(+), 26 deletions(-) diff --git a/gdb/frame.c b/gdb/frame.c index 4755c8e9aa7f..ef58253312e8 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -3224,8 +3224,8 @@ frame_info_ptr::frame_info_ptr (struct frame_info *ptr) /* See frame-info-ptr.h. */ -void -frame_info_ptr::reinflate () +frame_info * +frame_info_ptr::reinflate () const { /* Ensure we have a valid frame level (sentinel frame or above). */ gdb_assert (m_cached_level >= -1); @@ -3233,7 +3233,7 @@ frame_info_ptr::reinflate () if (m_ptr != nullptr) { /* The frame_info wasn't invalidated, no need to reinflate. */ - return; + return m_ptr; } if (m_cached_id.user_created_p) @@ -3255,6 +3255,7 @@ frame_info_ptr::reinflate () } gdb_assert (m_ptr != nullptr); + return m_ptr; } void _initialize_frame (); diff --git a/gdb/frame.h b/gdb/frame.h index f8ca57815bf6..e02635c21408 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -275,29 +275,38 @@ class frame_info_ptr : public intrusive_list_node } frame_info *operator-> () const - { - return m_ptr; - } + { return this->reinflate (); } /* Fetch the underlying pointer. Note that new code should generally not use this -- avoid it if at all possible. */ frame_info *get () const { - return m_ptr; + if (this->is_null ()) + return nullptr; + + return this->reinflate (); } + /* Return true if this object is empty (does not wrap a frame_info + object). */ + + bool is_null () const + { + return m_cached_level == this->invalid_level; + }; + /* This exists for compatibility with pre-existing code that checked a "frame_info *" using "!". */ bool operator! () const { - return m_ptr == nullptr; + return this->is_null (); } /* This exists for compatibility with pre-existing code that checked a "frame_info *" like "if (ptr)". */ explicit operator bool () const { - return m_ptr != nullptr; + return !this->is_null (); } /* Invalidate this pointer. */ @@ -306,17 +315,18 @@ class frame_info_ptr : public intrusive_list_node m_ptr = nullptr; } - /* Use the cached frame_id to reinflate the pointer. */ - void reinflate (); - private: /* We sometimes need to construct frame_info_ptr objects around the sentinel_frame, which has level -1. Therefore, make the invalid frame level value -2. */ static constexpr int invalid_level = -2; + /* Use the cached frame level and id to reinflate the pointer, and return + it. */ + frame_info *reinflate () const; + /* The underlying pointer. */ - frame_info *m_ptr = nullptr; + mutable frame_info *m_ptr = nullptr; /* The frame_id of the underlying pointer. @@ -341,37 +351,46 @@ class frame_info_ptr : public intrusive_list_node static inline bool operator== (const frame_info *self, const frame_info_ptr &other) { + if (self == nullptr || other.is_null ()) + return self == nullptr && other.is_null (); + return self == other.get (); } static inline bool operator== (const frame_info_ptr &self, const frame_info_ptr &other) { + if (self.is_null () || other.is_null ()) + return self.is_null () && other.is_null (); + return self.get () == other.get (); } static inline bool operator== (const frame_info_ptr &self, const frame_info *other) { + if (self.is_null () || other == nullptr) + return self.is_null () && other == nullptr; + return self.get () == other; } static inline bool operator!= (const frame_info *self, const frame_info_ptr &other) { - return self != other.get (); + return !(self == other); } static inline bool operator!= (const frame_info_ptr &self, const frame_info_ptr &other) { - return self.get () != other.get (); + return !(self == other); } static inline bool operator!= (const frame_info_ptr &self, const frame_info *other) { - return self.get () != other; + return !(self == other); } /* For every stopped thread, GDB tracks two frames: current and diff --git a/gdb/infcmd.c b/gdb/infcmd.c index ee3d97b585dd..d1f634f86b1d 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1917,7 +1917,6 @@ finish_command (const char *arg, int from_tty) print_stack_frame (callee_frame, 1, LOCATION, 0); } - frame.reinflate (); if (execution_direction == EXEC_REVERSE) finish_backward (sm); diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index 186d53156730..16be1938c033 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -180,7 +180,6 @@ mi_cmd_stack_list_frames (const char *command, char **argv, int argc) If args is 0, don't print the arguments. */ print_frame_info (user_frame_print_options, fi, 1, LOC_AND_ADDRESS, 0 /* args */, 0); - fi.reinflate (); } } } diff --git a/gdb/stack.c b/gdb/stack.c index 126ce0b8cc2a..5bc5b2d26cfe 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -367,7 +367,6 @@ print_stack_frame (frame_info_ptr frame, int print_level, print_frame_info (user_frame_print_options, frame, print_level, print_what, 1 /* print_args */, set_current_sal); - frame.reinflate (); if (set_current_sal) set_current_sal_from_frame (frame); } @@ -903,7 +902,6 @@ print_frame_args (const frame_print_options &fp_opts, } first = 0; - frame.reinflate (); } } @@ -1173,7 +1171,6 @@ print_frame_info (const frame_print_options &fp_opts, print_source_lines (sal.symtab, sal.line, sal.line + 1, 0); } - frame.reinflate (); /* If disassemble-next-line is set to on and there is line debug messages, output assembly codes for next line. */ @@ -1676,8 +1673,6 @@ info_frame_command_core (frame_info_ptr fi, bool selected_frame_p) print_frame_args (user_frame_print_options, func, fi, numargs, gdb_stdout); - fi.reinflate (); - gdb_puts ("\n"); } } @@ -2077,7 +2072,6 @@ backtrace_command_1 (const frame_print_options &fp_opts, print_frame_local_vars (fi, false, NULL, NULL, 1, gdb_stdout); /* Save the last frame to check for error conditions. */ - fi.reinflate (); trailing = fi; } diff --git a/gdb/unittests/frame_info_ptr-selftests.c b/gdb/unittests/frame_info_ptr-selftests.c index 47306113c7aa..fe1e7be35daa 100644 --- a/gdb/unittests/frame_info_ptr-selftests.c +++ b/gdb/unittests/frame_info_ptr-selftests.c @@ -41,7 +41,6 @@ user_created_frame_callee (frame_info_ptr frame) validate_user_created_frame (get_frame_id (frame)); reinit_frame_cache (); - frame.reinflate (); validate_user_created_frame (get_frame_id (frame)); @@ -61,7 +60,6 @@ test_user_created_frame () validate that the reinflation in both the callee and caller restore the same frame_info object. */ frame_info_ptr callees_frame_info = user_created_frame_callee (frame); - frame.reinflate (); validate_user_created_frame (get_frame_id (frame)); SELF_CHECK (frame.get () == callees_frame_info.get ()); -- 2.38.1