public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb/python: convert gdbpy_err_fetch to use gdbpy_ref
@ 2022-06-15 9:03 Andrew Burgess
0 siblings, 0 replies; only message in thread
From: Andrew Burgess @ 2022-06-15 9:03 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8a0b60471a75ce81b8ea067f6e87457b3ed0c7a3
commit 8a0b60471a75ce81b8ea067f6e87457b3ed0c7a3
Author: Andrew Burgess <aburgess@redhat.com>
Date: Tue May 24 11:54:40 2022 +0100
gdb/python: convert gdbpy_err_fetch to use gdbpy_ref
Convert the gdbpy_err_fetch class to make use of gdbpy_ref, this
removes the need for manual reference count management, and allows the
destructor to be removed.
There should be no functional change after this commit.
I think this cleanup is worth doing on its own, however, in a later
commit I will want to copy instances of gdbpy_err_fetch, and switching
to using gdbpy_ref means that I can rely on the default copy
constructor, without having to add one that handles the reference
counts, so this is good preparation for that upcoming change.
Diff:
---
gdb/python/py-utils.c | 8 ++++----
gdb/python/python-internal.h | 23 ++++++++++-------------
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c
index 1bd7b477ecb..58c18c60e2c 100644
--- a/gdb/python/py-utils.c
+++ b/gdb/python/py-utils.c
@@ -194,10 +194,10 @@ gdbpy_err_fetch::to_string () const
Using str (aka PyObject_Str) will fetch the error message from
gdb.GdbError ("message"). */
- if (m_error_value && m_error_value != Py_None)
- return gdbpy_obj_to_string (m_error_value);
+ if (m_error_value.get () != nullptr && m_error_value.get () != Py_None)
+ return gdbpy_obj_to_string (m_error_value.get ());
else
- return gdbpy_obj_to_string (m_error_type);
+ return gdbpy_obj_to_string (m_error_type.get ());
}
/* See python-internal.h. */
@@ -205,7 +205,7 @@ gdbpy_err_fetch::to_string () const
gdb::unique_xmalloc_ptr<char>
gdbpy_err_fetch::type_to_string () const
{
- return gdbpy_obj_to_string (m_error_type);
+ return gdbpy_obj_to_string (m_error_type.get ());
}
/* Convert a GDB exception to the appropriate Python exception.
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 217bc15bb28..da2e79101a6 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -549,14 +549,12 @@ public:
gdbpy_err_fetch ()
{
- PyErr_Fetch (&m_error_type, &m_error_value, &m_error_traceback);
- }
+ PyObject *error_type, *error_value, *error_traceback;
- ~gdbpy_err_fetch ()
- {
- Py_XDECREF (m_error_type);
- Py_XDECREF (m_error_value);
- Py_XDECREF (m_error_traceback);
+ PyErr_Fetch (&error_type, &error_value, &error_traceback);
+ m_error_type.reset (error_type);
+ m_error_value.reset (error_value);
+ m_error_traceback.reset (error_traceback);
}
/* Call PyErr_Restore using the values stashed in this object.
@@ -565,10 +563,9 @@ public:
void restore ()
{
- PyErr_Restore (m_error_type, m_error_value, m_error_traceback);
- m_error_type = nullptr;
- m_error_value = nullptr;
- m_error_traceback = nullptr;
+ PyErr_Restore (m_error_type.release (),
+ m_error_value.release (),
+ m_error_traceback.release ());
}
/* Return the string representation of the exception represented by
@@ -587,12 +584,12 @@ public:
bool type_matches (PyObject *type) const
{
- return PyErr_GivenExceptionMatches (m_error_type, type);
+ return PyErr_GivenExceptionMatches (m_error_type.get (), type);
}
private:
- PyObject *m_error_type, *m_error_value, *m_error_traceback;
+ gdbpy_ref<> m_error_type, m_error_value, m_error_traceback;
};
/* Called before entering the Python interpreter to install the
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-15 9:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15 9:03 [binutils-gdb] gdb/python: convert gdbpy_err_fetch to use gdbpy_ref Andrew Burgess
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).