From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id B08B33857433 for ; Wed, 15 Jun 2022 09:04:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B08B33857433 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-591-dTndqgxQOP2lMVSxrSJR8g-1; Wed, 15 Jun 2022 05:04:16 -0400 X-MC-Unique: dTndqgxQOP2lMVSxrSJR8g-1 Received: by mail-wr1-f72.google.com with SMTP id c7-20020adfa707000000b002184d715e69so1662586wrd.10 for ; Wed, 15 Jun 2022 02:04:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D5Lmkh55m4V5CuOhRMJU54ldM32Y3ZcwBYNYgTuY+5w=; b=guhW7SifIr2BstzP0cJptlC15TSxOtTBap2/oUEPQKNU3uM5HUNj9vg9E4hCzuA+cH PyHfsd7LO3wTIbc+qk/u8u84W/tZnlO9jbmnEDj6OWW/21zVQOm8J2/9PCy1ASESAUTH w9I3B6BgBU5JUrrPZuA9aDpNdjIGL+mkpqXeGi61nqvW95Mrmq9U6d8A5x7NVifYJy0g gFETq3Y3CN9nzF5yymfI073UqYZ7pUQV5sms0aR2HbtplWTKmCxBt28Ki8o4cmI0fvCy xhHtbk3aRgZJig0BDv3wUi0F6jEvFFpfcwFY5cN+LXjHaNDM6yUiR6Kfqx0ZF26PBgfo XqnQ== X-Gm-Message-State: AJIora/WSJByH99uUDemUiy87JefgsNSxBpU34w/WnwTI5txcj87+9Q9 IeuvlsDzZfjbs2Bs2Eg/gnmrDQj4Cco7JT9wvNFAzGH7N/vNH1HHTgamVYsZbsj0bDmsD6rbFva TgFyRGdrGTVkVLWXkXBkUYCDS7QArkhZp6t6Jp6+pkNBXdPV+lklSY6ti29wHOmwOOBY85ovhow == X-Received: by 2002:a5d:64c2:0:b0:20f:dc21:e658 with SMTP id f2-20020a5d64c2000000b0020fdc21e658mr8973647wri.508.1655283854805; Wed, 15 Jun 2022 02:04:14 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vGH52TKOfDaTGX3oz4TXcDWlgKCeb5M5zFHk0KfI7dEc3+7oC3oTvzWSCjJKl7GzsiU+tZ1A== X-Received: by 2002:a5d:64c2:0:b0:20f:dc21:e658 with SMTP id f2-20020a5d64c2000000b0020fdc21e658mr8973615wri.508.1655283854423; Wed, 15 Jun 2022 02:04:14 -0700 (PDT) Received: from localhost (host109-154-20-145.range109-154.btcentralplus.com. [109.154.20.145]) by smtp.gmail.com with ESMTPSA id i22-20020a05600c355600b003973b9d0447sm2165387wmq.36.2022.06.15.02.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 02:04:13 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PUSHED 1/6] gdb/python: convert gdbpy_err_fetch to use gdbpy_ref Date: Wed, 15 Jun 2022 10:04:03 +0100 Message-Id: <8a0b60471a75ce81b8ea067f6e87457b3ed0c7a3.1655283628.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 09:04:19 -0000 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. --- 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 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 @@ class gdbpy_err_fetch 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 @@ class gdbpy_err_fetch 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 @@ class gdbpy_err_fetch 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 -- 2.25.4