[3.12] gh-102304: Rename _Py_IncRefTotal_DO_NOT_USE_THIS() (GH-107193) (#107199)

miss-islington · vstinner · web-flow · commit 3923639a7765 · 2023-07-24T22:59:51.000+02:00
gh-102304: Rename _Py_IncRefTotal_DO_NOT_USE_THIS() (GH-107193) * Rename _Py_IncRefTotal_DO_NOT_USE_THIS() to _Py_INCREF_IncRefTotal() * Rename _Py_DecRefTotal_DO_NOT_USE_THIS() to _Py_DECREF_DecRefTotal() * Remove temporary _Py_INC_REFTOTAL() and _Py_DEC_REFTOTAL() macros (cherry picked from commit 8ebc9fc) Co-authored-by: Victor Stinner <vstinner@python.org>
diff --git a/Include/object.h b/Include/object.h
@@ -588,10 +588,8 @@ you can count such references to the type object.)
 #if defined(Py_REF_DEBUG) && !defined(Py_LIMITED_API)
 PyAPI_FUNC(void) _Py_NegativeRefcount(const char *filename, int lineno,
                                       PyObject *op);
-PyAPI_FUNC(void) _Py_IncRefTotal_DO_NOT_USE_THIS(void);
-PyAPI_FUNC(void) _Py_DecRefTotal_DO_NOT_USE_THIS(void);
-#    define _Py_INC_REFTOTAL() _Py_IncRefTotal_DO_NOT_USE_THIS()
-#    define _Py_DEC_REFTOTAL() _Py_DecRefTotal_DO_NOT_USE_THIS()
+PyAPI_FUNC(void) _Py_INCREF_IncRefTotal(void);
+PyAPI_FUNC(void) _Py_DECREF_DecRefTotal(void);
 #endif  // Py_REF_DEBUG && !Py_LIMITED_API
 
 PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
@@ -640,7 +638,7 @@ static inline Py_ALWAYS_INLINE void Py_INCREF(PyObject *op)
 #endif
     _Py_INCREF_STAT_INC();
 #ifdef Py_REF_DEBUG
-    _Py_INC_REFTOTAL();
+    _Py_INCREF_IncRefTotal();
 #endif
 #endif
 }
@@ -669,7 +667,7 @@ static inline void Py_DECREF(const char *filename, int lineno, PyObject *op)
         return;
     }
     _Py_DECREF_STAT_INC();
-    _Py_DEC_REFTOTAL();
+    _Py_DECREF_DecRefTotal();
     if (--op->ob_refcnt != 0) {
         if (op->ob_refcnt < 0) {
             _Py_NegativeRefcount(filename, lineno, op);
@@ -697,9 +695,6 @@ static inline Py_ALWAYS_INLINE void Py_DECREF(PyObject *op)
 #define Py_DECREF(op) Py_DECREF(_PyObject_CAST(op))
 #endif
 
-#undef _Py_INC_REFTOTAL
-#undef _Py_DEC_REFTOTAL
-
 
 /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
  * and tp_dealloc implementations.
diff --git a/Objects/object.c b/Objects/object.c
@@ -206,14 +206,14 @@ _Py_NegativeRefcount(const char *filename, int lineno, PyObject *op)
 
 /* This is used strictly by Py_INCREF(). */
 void
-_Py_IncRefTotal_DO_NOT_USE_THIS(void)
+_Py_INCREF_IncRefTotal(void)
 {
     reftotal_increment(_PyInterpreterState_GET());
 }
 
 /* This is used strictly by Py_DECREF(). */
 void
-_Py_DecRefTotal_DO_NOT_USE_THIS(void)
+_Py_DECREF_DecRefTotal(void)
 {
     reftotal_decrement(_PyInterpreterState_GET());
 }

Original file line number	Diff line number	Diff line change
`@@ -206,14 +206,14 @@ _Py_NegativeRefcount(const char filename, int lineno, PyObject op)`
`206`	`206`
`207`	`207`	`/* This is used strictly by Py_INCREF(). */`
`208`	`208`	`void`
`209`		`-_Py_IncRefTotal_DO_NOT_USE_THIS(void)`
	`209`	`+_Py_INCREF_IncRefTotal(void)`
`210`	`210`	`{`
`211`	`211`	`reftotal_increment(_PyInterpreterState_GET());`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`/* This is used strictly by Py_DECREF(). */`
`215`	`215`	`void`
`216`		`-_Py_DecRefTotal_DO_NOT_USE_THIS(void)`
	`216`	`+_Py_DECREF_DecRefTotal(void)`
`217`	`217`	`{`
`218`	`218`	`reftotal_decrement(_PyInterpreterState_GET());`
`219`	`219`	`}`