[gdb/python] Use GDB_PY_HANDLE_EXCEPTION more often

I found a few more places where we can use GDB_PY_HANDLE_EXCEPTION.

Tested on x86_64-linux.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c
index c6f566221d829fa47ee2a8f41a9e3c5cfc3b4779..178efab4cee4e4136be0ca42d53b48e4224b8fb4 100644 (file)
--- a/gdb/python/py-arch.c
+++ b/gdb/python/py-arch.c
@@ -199,8 +199,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
        }
       catch (const gdb_exception &except)
        {
-         gdbpy_convert_exception (except);
-         return NULL;
+         GDB_PY_HANDLE_EXCEPTION (except);
        }
 
       gdbpy_ref<> pc_obj = gdb_py_object_from_ulongest (pc);

diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index 74013977f0d64e3a512796185983be8dedd9058f..19e244f7998ffea407e4025c9e54368d155b7527 100644 (file)
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -640,8 +640,7 @@ bppy_get_commands (PyObject *self, void *closure)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return NULL;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   return host_string_to_python_string (stb.c_str ()).release ();

diff --git a/gdb/python/py-connection.c b/gdb/python/py-connection.c
index dcca76b7867ba72c814fc43b78055254ee5c8045..79e27677442fd01c5525f8bad129e94cc5e1ab54 100644 (file)
--- a/gdb/python/py-connection.c
+++ b/gdb/python/py-connection.c
@@ -431,8 +431,7 @@ connpy_send_packet (PyObject *self, PyObject *args, PyObject *kw)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return nullptr;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 }
 

diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index bbb42afb2ede08ae5748a810ed075a55568d4c1c..7f617fa5cead3df2b21e6e11d23a364074e3a685 100644 (file)
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -389,8 +389,7 @@ frame_info_to_frame_object (const frame_info_ptr &frame)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return NULL;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   return (PyObject *) frame_obj.release ();
@@ -538,8 +537,7 @@ frapy_read_var (PyObject *self, PyObject *args, PyObject *kw)
        }
       catch (const gdb_exception &except)
        {
-         gdbpy_convert_exception (except);
-         return NULL;
+         GDB_PY_HANDLE_EXCEPTION (except);
        }
 
       if (!var)

diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c
index 92287eea7c9199acb550ec2e297348608a0a5227..14a76b4fa135c333f4862b9afed0173be694aff6 100644 (file)
--- a/gdb/python/py-gdb-readline.c
+++ b/gdb/python/py-gdb-readline.c
@@ -59,8 +59,7 @@ gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
       /* This readline callback is called without the GIL held.  */
       gdbpy_gil gil;
 
-      gdbpy_convert_exception (except);
-      return NULL;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   /* Detect EOF (Ctrl-D).  */

diff --git a/gdb/python/py-mi.c b/gdb/python/py-mi.c
index bc95e86a4566e0b1c7f5c97cf083ccdbfc963367..0a636543f9aaaa6935931444e107035a7f02258d 100644 (file)
--- a/gdb/python/py-mi.c
+++ b/gdb/python/py-mi.c
@@ -168,8 +168,7 @@ gdbpy_execute_mi_command (PyObject *self, PyObject *args, PyObject *kw)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return nullptr;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   return uiout.result ().release ();

diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c
index 68b474cc1b4db00d354243ed8ddd37dd086879b8..30d0e8305db9bd069dabdcc25cfeb634fb355153 100644 (file)
--- a/gdb/python/py-record-btrace.c
+++ b/gdb/python/py-record-btrace.c
@@ -318,8 +318,7 @@ recpy_bt_insn_decoded (PyObject *self, void *closure)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return NULL;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   return PyBytes_FromString (strfile.string ().c_str ());

diff --git a/gdb/python/py-record.c b/gdb/python/py-record.c
index 2e0834c15ac137b4ffa109b36362ae32919ecee5..759bf3049cb82f09dc9ef41c23598c58998b3b46 100644 (file)
--- a/gdb/python/py-record.c
+++ b/gdb/python/py-record.c
@@ -670,7 +670,6 @@ gdbpy_start_recording (PyObject *self, PyObject *args)
 {
   const char *method = NULL;
   const char *format = NULL;
-  PyObject *ret = NULL;
 
   if (!PyArg_ParseTuple (args, "|ss", &method, &format))
     return NULL;
@@ -678,14 +677,12 @@ gdbpy_start_recording (PyObject *self, PyObject *args)
   try
     {
       record_start (method, format, 0);
-      ret = gdbpy_current_recording (self, args);
+      return gdbpy_current_recording (self, args);
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
-
-  return ret;
 }
 
 /* Implementation of gdb.current_recording (self) -> gdb.Record.  */

diff --git a/gdb/python/py-stopevent.c b/gdb/python/py-stopevent.c
index be26bc17f859060d37bd6c3affcb34ff528dea36..47f81bd6c9a6a47a4619155a4ef7d916944a2838 100644 (file)
--- a/gdb/python/py-stopevent.c
+++ b/gdb/python/py-stopevent.c
@@ -74,8 +74,7 @@ py_print_bpstat (bpstat *bs, enum gdb_signal stop_signal)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return nullptr;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   gdbpy_ref<> dict = uiout.result ();

diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c
index 984fa9b6b45642bfa6028e558969fcb688587e54..3bcd02da3872f8f319ed8d5ecaea9bcd7c624f06 100644 (file)
--- a/gdb/python/py-tui.c
+++ b/gdb/python/py-tui.c
@@ -415,8 +415,7 @@ gdbpy_register_tui_window (PyObject *self, PyObject *args, PyObject *kw)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return nullptr;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   Py_RETURN_NONE;

diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index 4980076a0ef4af5e7d163fa5695038b1f5911ade..37d5716b6d836c0faa14f1c2db0b36e11a4cbf60 100644 (file)
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -2056,8 +2056,7 @@ convert_value_from_python (PyObject *obj)
     }
   catch (const gdb_exception &except)
     {
-      gdbpy_convert_exception (except);
-      return NULL;
+      GDB_PY_HANDLE_EXCEPTION (except);
     }
 
   return value;

diff --git a/gdb/python/python.c b/gdb/python/python.c
index 043c221b0d8ce2ec773b719baa71a134216ee5a2..a2ce1f6545ae7d974de242c01c9916afbfdaeebd 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -972,8 +972,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
   catch (const gdb_exception &ex)
     {
       /* We know this will always throw.  */
-      gdbpy_convert_exception (ex);
-      return NULL;
+      GDB_PY_HANDLE_EXCEPTION (ex);
     }
 
   if (!sals.empty ())