public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Andrew Burgess <aburgess@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/python: convert gdbpy_err_fetch to use gdbpy_ref Date: Wed, 15 Jun 2022 09:03:32 +0000 (GMT) [thread overview] Message-ID: <20220615090332.8FE3A384D181@sourceware.org> (raw) 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
reply other threads:[~2022-06-15 9:03 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220615090332.8FE3A384D181@sourceware.org \ --to=aburgess@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).