[PATCH 2/6] Add safety wrappers for from_{longest,ulongest}

[Tom Tromey <tom@tromey.com>]

This adds a couple of safety wrappers for the APIs that convert from a
LONGEST or ULONGEST to Python.  This allows the removal of some
FIXMEs.
---
 gdb/python/py-arch.c     | 14 ++------------
 gdb/python/py-wrappers.h | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c
index a6fd12b5ce5..3de1b3c4533 100644
--- a/gdb/python/py-arch.c
+++ b/gdb/python/py-arch.c
@@ -198,21 +198,11 @@ arch_object::disassemble (gdbpy_borrowed_ref<> args,
       string_file stb (styling_p);
       int insn_len = gdb_print_insn (gdbarch, pc, &stb, NULL);
 
-      /* FIXME: Python safety.  Eventually gdb_py_object_from_ulongest
-	 should throw.  */
-      gdbpy_ref<> pc_obj = gdb_py_object_from_ulongest (pc);
-      if (pc_obj == nullptr)
-	throw gdb_python_exception ();
-
+      gdbpy_ref<> pc_obj = gdbpy_safe_from_ulongest (pc);
       gdbpy_ref<> asm_obj = gdbpy_unicode_from_string (!stb.empty ()
 						       ? stb.c_str ()
 						       : "<unknown>");
-
-      /* FIXME: Python safety.  Eventually gdb_py_object_from_longest
-	 should throw.  */
-      gdbpy_ref<> len_obj = gdb_py_object_from_longest (insn_len);
-      if (len_obj == nullptr)
-	throw gdb_python_exception ();
+      gdbpy_ref<> len_obj = gdbpy_safe_from_longest (insn_len);
 
       gdbpy_dict_set_item_string (insn_dict, "addr", pc_obj);
       gdbpy_dict_set_item_string (insn_dict, "asm", asm_obj);
diff --git a/gdb/python/py-wrappers.h b/gdb/python/py-wrappers.h
index 2e2d451167a..69295fa6af3 100644
--- a/gdb/python/py-wrappers.h
+++ b/gdb/python/py-wrappers.h
@@ -384,4 +384,23 @@ gdbpy_get_address (gdbpy_borrowed_ref<> obj)
   return result;
 }
 
+/* A wrapper for gdb_py_object_from_longest that throws on error.  */
+static inline gdbpy_ref<>
+gdbpy_safe_from_longest (LONGEST l)
+{
+  gdbpy_ref<> result = gdb_py_object_from_longest (l);
+  if (result == nullptr)
+    throw gdb_python_exception ();
+  return result;
+}
+
+/* A wrapper for gdb_py_object_from_ulongest that throws on error.  */
+static inline gdbpy_ref<>
+gdbpy_safe_from_ulongest (ULONGEST l)
+{
+  gdbpy_ref<> result = gdb_py_object_from_ulongest (l);
+  if (result == nullptr)
+    throw gdb_python_exception ();
+  return result;
+}
 #endif /* GDB_PYTHON_PY_WRAPPERS_H */

-- 
2.49.0