[1/7] Don't use PyInt_FromSsize_t

Message ID 20200911143309.2838879-2-tromey@adacore.com
State New
Headers show
Series
  • Standarize int-wrapping approach in Python code
Related show

Commit Message

Tom Tromey Sept. 11, 2020, 2:33 p.m.
Change the Python layer to avoid PyInt_FromSsize_t, and remove the
compatibility define.

2020-09-11  Tom Tromey  <tromey@adacore.com>

	* python/python-internal.h (PyInt_FromSsize_t): Remove define.
	* python/py-record.c (recpy_element_number): Use
	gdb_py_object_from_longest.
	(recpy_gap_number): Likewise.
---
 gdb/ChangeLog                | 7 +++++++
 gdb/python/py-record.c       | 4 ++--
 gdb/python/python-internal.h | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.26.2

Patch

diff --git a/gdb/python/py-record.c b/gdb/python/py-record.c
index a081ca942f3..a6b08dcdd83 100644
--- a/gdb/python/py-record.c
+++ b/gdb/python/py-record.c
@@ -374,7 +374,7 @@  recpy_element_number (PyObject *self, void* closure)
 {
   const recpy_element_object * const obj = (recpy_element_object *) self;
 
-  return PyInt_FromSsize_t (obj->number);
+  return gdb_py_object_from_longest (obj->number).release ();
 }
 
 /* Implementation of RecordInstruction.__hash__ [int] and
@@ -454,7 +454,7 @@  recpy_gap_number (PyObject *self, void *closure)
 {
   const recpy_gap_object * const obj = (const recpy_gap_object *) self;
 
-  return PyInt_FromSsize_t (obj->number);
+  return gdb_py_object_from_longest (obj->number).release ();
 }
 
 /* Implementation of RecordGap.error_code [int].  */
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 6874543441b..e406f37533e 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -97,7 +97,6 @@ 
 
 #define PyInt_Check PyLong_Check
 #define PyInt_FromLong PyLong_FromLong
-#define PyInt_FromSsize_t PyLong_FromSsize_t
 #define PyInt_AsLong PyLong_AsLong
 #define PyInt_AsSsize_t PyLong_AsSsize_t