mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 03:51:15 +08:00
c29a6445a9
Currently, despite having a smart pointer for frame_infos, GDB may attempt to use an invalidated frame_info_ptr, which would cause internal errors to happen. One such example has been documented as PR python/28856, that happened when printing frame arguments calls an inferior function. To avoid failures, the smart wrapper was changed to also cache the frame id, so the pointer can be reinflated later. For this to work, the frame-id stuff had to be moved to their own .h file, which is included by frame-info.h. Frame_id caching is done explicitly using the prepare_reinflate method. Caching is done manually so that only the pointers that need to be saved will be, and reinflating has to be done manually using the reinflate method because the get method and the -> operator must not change the internals of the class. Finally, attempting to reinflate when the pointer is being invalidated causes the following assertion errors: check_ptrace_stopped_lwp_gone: assertion `lp->stopped` failed. get_frame_pc: Assertion `frame->next != NULL` failed. As for performance concerns, my personal testing with `time make chec-perf GDB_PERFTEST_MODE=run` showed an actual reduction of around 10% of time running. This commit also adds a testcase that exercises the python/28856 bug with 7 different triggers, run, continue, step, backtrace, finish, up and down. Some of them can seem to be testing the same thing twice, but since this test relies on stale pointers, there is always a chance that GDB got lucky when testing, so better to test extra. Regression tested on x86_64, using both gcc and clang. Approved-by: Tom Tomey <tom@tromey.com>
207 lines
5.0 KiB
C++
207 lines
5.0 KiB
C++
/* Frame info pointer
|
|
|
|
Copyright (C) 2022 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef GDB_FRAME_INFO_H
|
|
#define GDB_FRAME_INFO_H
|
|
|
|
#include "gdbsupport/intrusive_list.h"
|
|
#include "frame-id.h"
|
|
|
|
struct frame_info;
|
|
|
|
/* Forward declarations of functions, needed for the frame_info_ptr
|
|
to work correctly. */
|
|
extern void reinit_frame_cache ();
|
|
extern struct frame_id get_frame_id (frame_info_ptr);
|
|
extern frame_info_ptr frame_find_by_id (struct frame_id id);
|
|
|
|
/* A wrapper for "frame_info *". frame_info objects are invalidated
|
|
whenever reinit_frame_cache is called. This class arranges to
|
|
invalidate the pointer when appropriate. This is done to help
|
|
detect a GDB bug that was relatively common.
|
|
|
|
A small amount of code must still operate on raw pointers, so a
|
|
"get" method is provided. However, you should normally not use
|
|
this in new code. */
|
|
|
|
class frame_info_ptr : public intrusive_list_node<frame_info_ptr>
|
|
{
|
|
public:
|
|
/* Create a frame_info_ptr from a raw pointer. */
|
|
explicit frame_info_ptr (struct frame_info *ptr)
|
|
: m_ptr (ptr)
|
|
{
|
|
frame_list.push_back (*this);
|
|
}
|
|
|
|
/* Create a null frame_info_ptr. */
|
|
frame_info_ptr ()
|
|
{
|
|
frame_list.push_back (*this);
|
|
}
|
|
|
|
frame_info_ptr (std::nullptr_t)
|
|
{
|
|
frame_list.push_back (*this);
|
|
}
|
|
|
|
frame_info_ptr (const frame_info_ptr &other)
|
|
: m_ptr (other.m_ptr), m_cached_id (other.m_cached_id)
|
|
{
|
|
frame_list.push_back (*this);
|
|
}
|
|
|
|
frame_info_ptr (frame_info_ptr &&other)
|
|
: m_ptr (other.m_ptr), m_cached_id (other.m_cached_id)
|
|
{
|
|
other.m_ptr = nullptr;
|
|
frame_list.push_back (*this);
|
|
}
|
|
|
|
~frame_info_ptr ()
|
|
{
|
|
frame_list.erase (frame_list.iterator_to (*this));
|
|
}
|
|
|
|
frame_info_ptr &operator= (const frame_info_ptr &other)
|
|
{
|
|
m_ptr = other.m_ptr;
|
|
m_cached_id = other.m_cached_id;
|
|
return *this;
|
|
}
|
|
|
|
frame_info_ptr &operator= (std::nullptr_t)
|
|
{
|
|
m_ptr = nullptr;
|
|
m_cached_id = null_frame_id;
|
|
return *this;
|
|
}
|
|
|
|
frame_info_ptr &operator= (frame_info_ptr &&other)
|
|
{
|
|
m_ptr = other.m_ptr;
|
|
m_cached_id = other.m_cached_id;
|
|
other.m_ptr = nullptr;
|
|
other.m_cached_id = null_frame_id;
|
|
return *this;
|
|
}
|
|
|
|
frame_info *operator-> () const
|
|
{
|
|
return m_ptr;
|
|
}
|
|
|
|
/* 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;
|
|
}
|
|
|
|
/* This exists for compatibility with pre-existing code that checked
|
|
a "frame_info *" using "!". */
|
|
bool operator! () const
|
|
{
|
|
return m_ptr == nullptr;
|
|
}
|
|
|
|
/* This exists for compatibility with pre-existing code that checked
|
|
a "frame_info *" like "if (ptr)". */
|
|
explicit operator bool () const
|
|
{
|
|
return m_ptr != nullptr;
|
|
}
|
|
|
|
/* Invalidate this pointer. */
|
|
void invalidate ()
|
|
{
|
|
m_ptr = nullptr;
|
|
}
|
|
|
|
/* Cache the frame_id that the pointer will use to reinflate. */
|
|
void prepare_reinflate ()
|
|
{
|
|
m_cached_id = get_frame_id (*this);
|
|
}
|
|
|
|
/* Use the cached frame_id to reinflate the pointer. */
|
|
void reinflate ()
|
|
{
|
|
gdb_assert (m_cached_id != null_frame_id);
|
|
|
|
if (m_ptr == nullptr)
|
|
m_ptr = frame_find_by_id (m_cached_id).get ();
|
|
gdb_assert (m_ptr != nullptr);
|
|
}
|
|
|
|
private:
|
|
|
|
/* The underlying pointer. */
|
|
frame_info *m_ptr = nullptr;
|
|
|
|
/* The frame_id of the underlying pointer. */
|
|
frame_id m_cached_id = null_frame_id;
|
|
|
|
/* All frame_info_ptr objects are kept on an intrusive list.
|
|
This keeps their construction and destruction costs
|
|
reasonably small. */
|
|
static intrusive_list<frame_info_ptr> frame_list;
|
|
|
|
/* A friend so it can invalidate the pointers. */
|
|
friend void reinit_frame_cache ();
|
|
};
|
|
|
|
static inline bool
|
|
operator== (const frame_info *self, const frame_info_ptr &other)
|
|
{
|
|
return self == other.get ();
|
|
}
|
|
|
|
static inline bool
|
|
operator== (const frame_info_ptr &self, const frame_info_ptr &other)
|
|
{
|
|
return self.get () == other.get ();
|
|
}
|
|
|
|
static inline bool
|
|
operator== (const frame_info_ptr &self, const frame_info *other)
|
|
{
|
|
return self.get () == other;
|
|
}
|
|
|
|
static inline bool
|
|
operator!= (const frame_info *self, const frame_info_ptr &other)
|
|
{
|
|
return self != other.get ();
|
|
}
|
|
|
|
static inline bool
|
|
operator!= (const frame_info_ptr &self, const frame_info_ptr &other)
|
|
{
|
|
return self.get () != other.get ();
|
|
}
|
|
|
|
static inline bool
|
|
operator!= (const frame_info_ptr &self, const frame_info *other)
|
|
{
|
|
return self.get () != other;
|
|
}
|
|
|
|
#endif /* GDB_FRAME_INFO_H */
|