diff options
| author | Tom Tromey <tom@tromey.com> | 2019-01-02 09:58:14 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-01-02 16:28:33 -0700 |
| commit | 61fd3e738919700c8d0fbb942519d72a767d90b1 (patch) | |
| tree | cac5f01b3d3ff229654cd69ea8c60b8afb817038 /gdb/python/py-inferior.c | |
| parent | d20172fc53017cef12d64b21aa2fdac72072558c (diff) | |
| download | binutils-61fd3e738919700c8d0fbb942519d72a767d90b1.zip binutils-61fd3e738919700c8d0fbb942519d72a767d90b1.tar.gz binutils-61fd3e738919700c8d0fbb942519d72a767d90b1.tar.bz2 | |
Change inferior_to_inferior_object to return a gdbpy_ref
Most callers of inferior_to_inferior_object already use a gdbpy_ref,
so this changes inferior_to_inferior_object to return one. Doing this
revealed that create_thread_object was not correctly handling the case
where inferior_to_inferior_object failed, so this patch fixes this as
well.
gdb/ChangeLog
2019-01-02 Tom Tromey <tom@tromey.com>
* python/python-internal.h (inferior_to_inferior_object): Change
return type.
* python/py-exitedevent.c (create_exited_event_object): Update.
* python/py-inferior.c (inferior_to_inferior_object): Return
gdbpy_ref.
(python_new_inferior, python_inferior_deleted)
(thread_to_thread_object, delete_thread_object)
(build_inferior_list, gdbpy_selected_inferior): Update.
* python/py-infthread.c (create_thread_object): Update. Also fail
if inferior_to_inferior_object fails.
Diffstat (limited to 'gdb/python/py-inferior.c')
| -rw-r--r-- | gdb/python/py-inferior.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index b1b9e94..63b13d4 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -208,7 +208,7 @@ python_new_objfile (struct objfile *objfile) return it and increment the reference count, otherwise, create it. Return NULL on failure. */ -inferior_object * +gdbpy_ref<inferior_object> inferior_to_inferior_object (struct inferior *inferior) { inferior_object *inf_obj; @@ -218,7 +218,7 @@ inferior_to_inferior_object (struct inferior *inferior) { inf_obj = PyObject_New (inferior_object, &inferior_object_type); if (!inf_obj) - return NULL; + return NULL; inf_obj->inferior = inferior; inf_obj->threads = NULL; @@ -227,13 +227,11 @@ inferior_to_inferior_object (struct inferior *inferior) /* PyObject_New initializes the new object with a refcount of 1. This counts for the reference we are keeping in the inferior data. */ set_inferior_data (inferior, infpy_inf_data_key, inf_obj); - } /* We are returning a new reference. */ - Py_INCREF ((PyObject *)inf_obj); - - return inf_obj; + gdb_assert (inf_obj != nullptr); + return gdbpy_ref<inferior_object>::new_reference (inf_obj); } /* Called when a new inferior is created. Notifies any Python event @@ -249,7 +247,7 @@ python_new_inferior (struct inferior *inf) if (evregpy_no_listeners_p (gdb_py_events.new_inferior)) return; - gdbpy_ref<inferior_object> inf_obj (inferior_to_inferior_object (inf)); + gdbpy_ref<inferior_object> inf_obj = inferior_to_inferior_object (inf); if (inf_obj == NULL) { gdbpy_print_stack (); @@ -277,7 +275,7 @@ python_inferior_deleted (struct inferior *inf) if (evregpy_no_listeners_p (gdb_py_events.inferior_deleted)) return; - gdbpy_ref<inferior_object> inf_obj (inferior_to_inferior_object (inf)); + gdbpy_ref<inferior_object> inf_obj = inferior_to_inferior_object (inf); if (inf_obj == NULL) { gdbpy_print_stack (); @@ -295,7 +293,7 @@ python_inferior_deleted (struct inferior *inf) gdbpy_ref<> thread_to_thread_object (thread_info *thr) { - gdbpy_ref<inferior_object> inf_obj (inferior_to_inferior_object (thr->inf)); + gdbpy_ref<inferior_object> inf_obj = inferior_to_inferior_object (thr->inf); if (inf_obj == NULL) return NULL; @@ -358,8 +356,7 @@ delete_thread_object (struct thread_info *tp, int ignore) gdbpy_enter enter_py (python_gdbarch, python_language); - gdbpy_ref<inferior_object> inf_obj - ((inferior_object *) inferior_to_inferior_object (tp->inf)); + gdbpy_ref<inferior_object> inf_obj = inferior_to_inferior_object (tp->inf); if (inf_obj == NULL) return; @@ -466,7 +463,7 @@ static int build_inferior_list (struct inferior *inf, void *arg) { PyObject *list = (PyObject *) arg; - gdbpy_ref<inferior_object> inferior (inferior_to_inferior_object (inf)); + gdbpy_ref<inferior_object> inferior = inferior_to_inferior_object (inf); if (inferior == NULL) return 0; @@ -925,7 +922,8 @@ py_free_inferior (struct inferior *inf, void *datum) PyObject * gdbpy_selected_inferior (PyObject *self, PyObject *args) { - return (PyObject *) inferior_to_inferior_object (current_inferior ()); + return ((PyObject *) + inferior_to_inferior_object (current_inferior ()).release ()); } int |