From 61fd3e738919700c8d0fbb942519d72a767d90b1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 2 Jan 2019 09:58:14 -0700 Subject: [PATCH] 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 * 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. --- gdb/ChangeLog | 13 +++++++++++++ gdb/python/py-exitedevent.c | 2 +- gdb/python/py-inferior.c | 24 +++++++++++------------- gdb/python/py-infthread.c | 6 +++++- gdb/python/python-internal.h | 2 +- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c384618..4be6039 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2019-01-02 Tom Tromey + + * 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. + 2019-01-02 Simon Marchi * inferior.h (class inferior) : New field. diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c index 474aa25..5e9dabf 100644 --- a/gdb/python/py-exitedevent.c +++ b/gdb/python/py-exitedevent.c @@ -39,7 +39,7 @@ create_exited_event_object (const LONGEST *exit_code, struct inferior *inf) return NULL; } - gdbpy_ref inf_obj (inferior_to_inferior_object (inf)); + gdbpy_ref inf_obj = inferior_to_inferior_object (inf); if (inf_obj == NULL || evpy_add_attribute (exited_event.get (), "inferior", (PyObject *) inf_obj.get ()) < 0) 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_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::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 inf_obj (inferior_to_inferior_object (inf)); + gdbpy_ref 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 inf_obj (inferior_to_inferior_object (inf)); + gdbpy_ref 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 inf_obj (inferior_to_inferior_object (thr->inf)); + gdbpy_ref 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 inf_obj - ((inferior_object *) inferior_to_inferior_object (tp->inf)); + gdbpy_ref 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 (inferior_to_inferior_object (inf)); + gdbpy_ref 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 diff --git a/gdb/python/py-infthread.c b/gdb/python/py-infthread.c index e15e281..bf90d08 100644 --- a/gdb/python/py-infthread.c +++ b/gdb/python/py-infthread.c @@ -41,12 +41,16 @@ create_thread_object (struct thread_info *tp) { thread_object *thread_obj; + gdbpy_ref inf_obj = inferior_to_inferior_object (tp->inf); + if (inf_obj == NULL) + return NULL; + thread_obj = PyObject_New (thread_object, &thread_object_type); if (!thread_obj) return NULL; thread_obj->thread = tp; - thread_obj->inf_obj = (PyObject *) inferior_to_inferior_object (tp->inf); + thread_obj->inf_obj = (PyObject *) inf_obj.release (); return thread_obj; } diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index d8d3457..51919b7 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -521,7 +521,7 @@ PyObject *gdbarch_to_arch_object (struct gdbarch *gdbarch); thread_object *create_thread_object (struct thread_info *tp); gdbpy_ref<> thread_to_thread_object (thread_info *thr);; -inferior_object *inferior_to_inferior_object (inferior *inf); +gdbpy_ref inferior_to_inferior_object (inferior *inf); const struct block *block_object_to_block (PyObject *obj); struct symbol *symbol_object_to_symbol (PyObject *obj); -- 2.7.4