This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA 09/14] Use gdbpy_reference in py-linetable.c
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Sun, 6 Nov 2016 22:47:31 -0700
- Subject: [RFA 09/14] Use gdbpy_reference in py-linetable.c
- Authentication-results: sourceware.org; auth=none
- References: <1478497656-11832-1-git-send-email-tom@tromey.com>
This changes some code in py-linetable.c to use gdbpy_reference.
2016-11-06 Tom Tromey <tom@tromey.com>
* python/py-linetable.c (build_line_table_tuple_from_pcs)
(ltpy_get_all_source_lines): Use gdbpy_reference.
---
gdb/ChangeLog | 5 +++++
gdb/python/py-linetable.c | 51 +++++++++++++----------------------------------
2 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4921600..9aa7008 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2016-11-06 Tom Tromey <tom@tromey.com>
+ * python/py-linetable.c (build_line_table_tuple_from_pcs)
+ (ltpy_get_all_source_lines): Use gdbpy_reference.
+
+2016-11-06 Tom Tromey <tom@tromey.com>
+
* python/py-framefilter.c (extract_sym, extract_value)
(get_py_iter_from_func, bootstrap_python_frame_filters): Use
gdbpy_reference.
diff --git a/gdb/python/py-linetable.c b/gdb/python/py-linetable.c
index 662ae88..8be7e0e 100644
--- a/gdb/python/py-linetable.c
+++ b/gdb/python/py-linetable.c
@@ -19,6 +19,7 @@
#include "defs.h"
#include "python-internal.h"
+#include "py-ref.h"
typedef struct {
PyObject_HEAD
@@ -124,7 +125,6 @@ static PyObject *
build_line_table_tuple_from_pcs (int line, VEC (CORE_ADDR) *vec)
{
int vec_len = 0;
- PyObject *tuple;
CORE_ADDR pc;
int i;
@@ -132,31 +132,22 @@ build_line_table_tuple_from_pcs (int line, VEC (CORE_ADDR) *vec)
if (vec_len < 1)
Py_RETURN_NONE;
- tuple = PyTuple_New (vec_len);
+ gdbpy_reference tuple (PyTuple_New (vec_len));
if (tuple == NULL)
return NULL;
for (i = 0; VEC_iterate (CORE_ADDR, vec, i, pc); ++i)
{
- PyObject *obj = build_linetable_entry (line, pc);
+ gdbpy_reference obj (build_linetable_entry (line, pc));
if (obj == NULL)
- {
- Py_DECREF (tuple);
- tuple = NULL;
- break;
- }
- else if (PyTuple_SetItem (tuple, i, obj) != 0)
- {
- Py_DECREF (obj);
- Py_DECREF (tuple);
- tuple = NULL;
- break;
- }
+ return NULL;
+ else if (PyTuple_SetItem (tuple.get (), i, obj.release ()) != 0)
+ return NULL;
}
- return tuple;
+ return tuple.release ();
}
/* Implementation of gdb.LineTable.line (self) -> Tuple. Returns a
@@ -236,7 +227,6 @@ ltpy_get_all_source_lines (PyObject *self, PyObject *args)
{
struct symtab *symtab;
Py_ssize_t index;
- PyObject *source_list, *source_dict, *line;
struct linetable_entry *item;
LTPY_REQUIRE_VALID (self, symtab);
@@ -248,7 +238,7 @@ ltpy_get_all_source_lines (PyObject *self, PyObject *args)
return NULL;
}
- source_dict = PyDict_New ();
+ gdbpy_reference source_dict (PyDict_New ());
if (source_dict == NULL)
return NULL;
@@ -260,30 +250,17 @@ ltpy_get_all_source_lines (PyObject *self, PyObject *args)
include in the source set. */
if (item->line > 0)
{
- line = gdb_py_object_from_longest (item->line);
+ gdbpy_reference line (gdb_py_object_from_longest (item->line));
if (line == NULL)
- {
- Py_DECREF (source_dict);
- return NULL;
- }
-
- if (PyDict_SetItem (source_dict, line, Py_None) == -1)
- {
- Py_DECREF (line);
- Py_DECREF (source_dict);
- return NULL;
- }
-
- Py_DECREF (line);
+ return NULL;
+
+ if (PyDict_SetItem (source_dict.get (), line.get (), Py_None) == -1)
+ return NULL;
}
}
-
- source_list = PyDict_Keys (source_dict);
- Py_DECREF (source_dict);
-
- return source_list;
+ return PyDict_Keys (source_dict.get ());
}
/* Implementation of gdb.LineTable.is_valid (self) -> Boolean.
--
2.7.4