From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15529 invoked by alias); 13 Sep 2018 05:30:54 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 14999 invoked by uid 89); 13 Sep 2018 05:30:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.144.98) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 13 Sep 2018 05:30:29 +0000 Received: from cm15.websitewelcome.com (cm15.websitewelcome.com [100.42.49.9]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 8C262A9E5 for ; Thu, 13 Sep 2018 00:30:27 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 0KChgdfrYbXuJ0KCqgwZOe; Thu, 13 Sep 2018 00:30:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=lxcNQT7AHtm9aztFFFigk1dTQoTkVHri2+x6oQtK8dM=; b=yIaeo9QnIoKyGglwTNrf4dGNFR US7Yhy9F6Ulw3l5g3D6rdyOtUSvvACKoqENkdt0Az26ZCgv5EUmOH+plD0a2scDiYtx9d+uJKr0d6 8GrKHsbcvLDr/2qJxg1fanDC5; Received: from 97-122-189-157.hlrn.qwest.net ([97.122.189.157]:54318 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1g0KCh-0045EG-O3; Thu, 13 Sep 2018 00:30:11 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/4] Change objfile_to_objfile_object to return a new reference Date: Thu, 13 Sep 2018 05:30:00 -0000 Message-Id: <20180913053007.11780-3-tom@tromey.com> In-Reply-To: <20180913053007.11780-1-tom@tromey.com> References: <20180913053007.11780-1-tom@tromey.com> X-SW-Source: 2018-09/txt/msg00413.txt.bz2 This changes objfile_to_objfile_object to return a new references and fixes up all the uses. 2018-09-12 Tom Tromey * python/python-internal.h (objfile_to_objfile_object): Change return type. * python/py-newobjfileevent.c (create_new_objfile_event_object): Update. * python/py-xmethods.c (gdbpy_get_matching_xmethod_workers): Update. * python/python.c (gdbpy_get_current_objfile): Update. (gdbpy_objfiles): Update. * python/py-objfile.c (objfpy_get_owner, gdbpy_lookup_objfile): Update. (objfile_to_objfile_object): Return a new reference. * python/py-symtab.c (stpy_get_objfile): Update. * python/py-prettyprint.c (find_pretty_printer_from_objfiles): Update. --- gdb/ChangeLog | 17 +++++++++++++ gdb/python/py-newobjfileevent.c | 10 +++----- gdb/python/py-objfile.c | 43 +++++++++++++-------------------- gdb/python/py-prettyprint.c | 6 ++--- gdb/python/py-symtab.c | 5 +--- gdb/python/py-xmethods.c | 5 ++-- gdb/python/python-internal.h | 3 +-- gdb/python/python.c | 11 +++------ 8 files changed, 49 insertions(+), 51 deletions(-) diff --git a/gdb/python/py-newobjfileevent.c b/gdb/python/py-newobjfileevent.c index aa31fb4849b..55e884dcaf5 100644 --- a/gdb/python/py-newobjfileevent.c +++ b/gdb/python/py-newobjfileevent.c @@ -28,12 +28,10 @@ create_new_objfile_event_object (struct objfile *objfile) if (objfile_event == NULL) return NULL; - /* Note that objfile_to_objfile_object returns a borrowed reference, - so we don't need a decref here. */ - PyObject *py_objfile = objfile_to_objfile_object (objfile); - if (!py_objfile || evpy_add_attribute (objfile_event.get (), - "new_objfile", - py_objfile) < 0) + gdbpy_ref<> py_objfile = objfile_to_objfile_object (objfile); + if (py_objfile == NULL || evpy_add_attribute (objfile_event.get (), + "new_objfile", + py_objfile.get ()) < 0) return NULL; return objfile_event; diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c index 8fd160c7bf8..cef34f1bcc2 100644 --- a/gdb/python/py-objfile.c +++ b/gdb/python/py-objfile.c @@ -115,12 +115,7 @@ objfpy_get_owner (PyObject *self, void *closure) owner = objfile->separate_debug_objfile_backlink; if (owner != NULL) - { - PyObject *result = objfile_to_objfile_object (owner); - - Py_XINCREF (result); - return result; - } + return objfile_to_objfile_object (owner).release (); Py_RETURN_NONE; } @@ -590,12 +585,7 @@ gdbpy_lookup_objfile (PyObject *self, PyObject *args, PyObject *kw) objfile = objfpy_lookup_objfile_by_name (name); if (objfile != NULL) - { - PyObject *result = objfile_to_objfile_object (objfile); - - Py_XINCREF (result); - return result; - } + return objfile_to_objfile_object (objfile).release (); PyErr_SetString (PyExc_ValueError, _("Objfile not found.")); return NULL; @@ -613,30 +603,31 @@ py_free_objfile (struct objfile *objfile, void *datum) object->objfile = NULL; } -/* Return a borrowed reference to the Python object of type Objfile +/* Return a new reference to the Python object of type Objfile representing OBJFILE. If the object has already been created, return it. Otherwise, create it. Return NULL and set the Python error on failure. */ -PyObject * +gdbpy_ref<> objfile_to_objfile_object (struct objfile *objfile) { - gdbpy_ref object - ((objfile_object *) objfile_data (objfile, objfpy_objfile_data_key)); - if (object == NULL) + PyObject *result + = ((PyObject *) objfile_data (objfile, objfpy_objfile_data_key)); + if (result == NULL) { - object.reset (PyObject_New (objfile_object, &objfile_object_type)); - if (object != NULL) - { - if (!objfpy_initialize (object.get ())) - return NULL; + gdbpy_ref object + ((objfile_object *) PyObject_New (objfile_object, &objfile_object_type)); + if (object == NULL) + return NULL; + if (!objfpy_initialize (object.get ())) + return NULL; - object->objfile = objfile; - set_objfile_data (objfile, objfpy_objfile_data_key, object.get ()); - } + object->objfile = objfile; + set_objfile_data (objfile, objfpy_objfile_data_key, object.get ()); + result = (PyObject *) object.release (); } - return (PyObject *) object.release (); + return gdbpy_ref<>::new_reference (result); } int diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 9aadd3b27c9..a7062225816 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -97,15 +97,15 @@ find_pretty_printer_from_objfiles (PyObject *value) ALL_OBJFILES (obj) { - PyObject *objf = objfile_to_objfile_object (obj); - if (!objf) + gdbpy_ref<> objf = objfile_to_objfile_object (obj); + if (objf == NULL) { /* Ignore the error and continue. */ PyErr_Clear (); continue; } - gdbpy_ref<> pp_list (objfpy_get_printers (objf, NULL)); + gdbpy_ref<> pp_list (objfpy_get_printers (objf.get (), NULL)); gdbpy_ref<> function (search_pp_list (pp_list.get (), value)); /* If there is an error in any objfile list, abort the search and exit. */ diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c index be7fb3ec471..9bb20dab31f 100644 --- a/gdb/python/py-symtab.c +++ b/gdb/python/py-symtab.c @@ -117,13 +117,10 @@ static PyObject * stpy_get_objfile (PyObject *self, void *closure) { struct symtab *symtab = NULL; - PyObject *result; STPY_REQUIRE_VALID (self, symtab); - result = objfile_to_objfile_object (SYMTAB_OBJFILE (symtab)); - Py_XINCREF (result); - return result; + return objfile_to_objfile_object (SYMTAB_OBJFILE (symtab)).release (); } /* Getter function for symtab.producer. */ diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c index c568295a165..8e616cd4e2d 100644 --- a/gdb/python/py-xmethods.c +++ b/gdb/python/py-xmethods.c @@ -147,7 +147,7 @@ gdbpy_get_matching_xmethod_workers list individually, but there's no data yet to show it's needed. */ ALL_OBJFILES (objfile) { - PyObject *py_objfile = objfile_to_objfile_object (objfile); + gdbpy_ref<> py_objfile = objfile_to_objfile_object (objfile); if (py_objfile == NULL) { @@ -155,7 +155,8 @@ gdbpy_get_matching_xmethod_workers return EXT_LANG_RC_ERROR; } - gdbpy_ref<> objfile_matchers (objfpy_get_xmethods (py_objfile, NULL)); + gdbpy_ref<> objfile_matchers (objfpy_get_xmethods (py_objfile.get (), + NULL)); gdbpy_ref<> temp (PySequence_Concat (py_xmethod_matcher_list.get (), objfile_matchers.get ())); if (temp == NULL) diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index a6dc5f090b5..cbba3ff8ef6 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -523,8 +523,7 @@ PyObject *pspy_get_frame_filters (PyObject *, void *); PyObject *pspy_get_frame_unwinders (PyObject *, void *); PyObject *pspy_get_xmethods (PyObject *, void *); -PyObject *objfile_to_objfile_object (struct objfile *) - CPYCHECKER_RETURNS_BORROWED_REF; +gdbpy_ref<> objfile_to_objfile_object (struct objfile *); PyObject *objfpy_get_printers (PyObject *, void *); PyObject *objfpy_get_frame_filters (PyObject *, void *); PyObject *objfpy_get_frame_unwinders (PyObject *, void *); diff --git a/gdb/python/python.c b/gdb/python/python.c index 93d6d1156d8..778ddb9f342 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1421,15 +1421,10 @@ gdbpy_execute_objfile_script (const struct extension_language_defn *extlang, static PyObject * gdbpy_get_current_objfile (PyObject *unused1, PyObject *unused2) { - PyObject *result; - if (! gdbpy_current_objfile) Py_RETURN_NONE; - result = objfile_to_objfile_object (gdbpy_current_objfile); - if (result) - Py_INCREF (result); - return result; + return objfile_to_objfile_object (gdbpy_current_objfile).release (); } /* Return a sequence holding all the Objfiles. */ @@ -1445,9 +1440,9 @@ gdbpy_objfiles (PyObject *unused1, PyObject *unused2) ALL_OBJFILES (objf) { - PyObject *item = objfile_to_objfile_object (objf); + gdbpy_ref<> item = objfile_to_objfile_object (objf); - if (!item || PyList_Append (list.get (), item) == -1) + if (item == NULL || PyList_Append (list.get (), item.get ()) == -1) return NULL; } -- 2.17.1