From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 33970 invoked by alias); 30 Apr 2018 04:21:56 -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 33870 invoked by uid 89); 30 Apr 2018 04:21:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 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=H*MI:sk:2018043, H*i:sk:2018043, globals, Python 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; Mon, 30 Apr 2018 04:21:53 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 67B617EC0 for ; Sun, 29 Apr 2018 23:21:52 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id D0K0fa6eq5CKDD0K0f7Cff; Sun, 29 Apr 2018 23:21:52 -0500 X-Authority-Reason: nr=8 Received: from 97-122-176-117.hlrn.qwest.net ([97.122.176.117]:34252 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fD0K0-001psR-6i; Sun, 29 Apr 2018 23:21:52 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 4/4] Change Python code to use new_reference Date: Mon, 30 Apr 2018 04:21:00 -0000 Message-Id: <20180430042147.28337-5-tom@tromey.com> In-Reply-To: <20180430042147.28337-1-tom@tromey.com> References: <20180430042147.28337-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fD0K0-001psR-6i X-Source-Sender: 97-122-176-117.hlrn.qwest.net (bapiya.Home) [97.122.176.117]:34252 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-SW-Source: 2018-04/txt/msg00609.txt.bz2 This changes a few spots in the Python code to use new_reference rather than the manual incref+constructor that was previously being done. 2018-04-29 Tom Tromey * varobj.c (varobj_set_visualizer): Use new_reference. * python/python.c (gdbpy_decode_line): Use new_reference. * python/py-cmd.c (cmdpy_function, cmdpy_completer_helper): Use new_reference. --- gdb/ChangeLog | 7 +++++++ gdb/python/py-cmd.c | 7 +++---- gdb/python/python.c | 10 ++-------- gdb/varobj.c | 5 ++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c index bff445f62f..27c4689413 100644 --- a/gdb/python/py-cmd.c +++ b/gdb/python/py-cmd.c @@ -138,8 +138,8 @@ cmdpy_function (struct cmd_list_element *command, error (_("Could not convert arguments to Python string.")); } - gdbpy_ref<> ttyobj (from_tty ? Py_True : Py_False); - Py_INCREF (ttyobj.get ()); + gdbpy_ref<> ttyobj + = gdbpy_ref<>::new_reference (from_tty ? Py_True : Py_False); gdbpy_ref<> result (PyObject_CallMethodObjArgs ((PyObject *) obj, invoke_cst, argobj.get (), ttyobj.get (), NULL)); @@ -246,8 +246,7 @@ cmdpy_completer_helper (struct cmd_list_element *command, if (word == NULL) { /* "brkchars" phase. */ - wordobj.reset (Py_None); - Py_INCREF (Py_None); + wordobj = gdbpy_ref<>::new_reference (Py_None); } else { diff --git a/gdb/python/python.c b/gdb/python/python.c index 9eae8a1aef..0dd7d6a6ad 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -876,10 +876,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args) } } else - { - result.reset (Py_None); - Py_INCREF (Py_None); - } + result = gdbpy_ref<>::new_reference (Py_None); gdbpy_ref<> return_result (PyTuple_New (2)); if (return_result == NULL) @@ -892,10 +889,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args) return NULL; } else - { - unparsed.reset (Py_None); - Py_INCREF (Py_None); - } + unparsed = gdbpy_ref<>::new_reference (Py_None); PyTuple_SetItem (return_result.get (), 0, unparsed.release ()); PyTuple_SetItem (return_result.get (), 1, result.release ()); diff --git a/gdb/varobj.c b/gdb/varobj.c index 4656bfa6b9..a0df485ae9 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -1455,9 +1455,8 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer) gdbpy_enter_varobj enter_py (var); mainmod = PyImport_AddModule ("__main__"); - gdbpy_ref<> globals (PyModule_GetDict (mainmod)); - Py_INCREF (globals.get ()); - + gdbpy_ref<> globals + = gdbpy_ref<>::new_reference (PyModule_GetDict (mainmod)); gdbpy_ref<> constructor (PyRun_String (visualizer, Py_eval_input, globals.get (), globals.get ())); -- 2.13.6