gh-102304: Fix 2 New Stable ABI Functions (gh-104762)

diff --git a/Include/object.h b/Include/object.h
index c4fe2f83ef62bccced308d1c758f7e33e4dccc89..c2fee85a2c38f6a48809fdb25f7b0fa08d22eda1 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -590,7 +590,7 @@ you can count such references to the type object.)
 extern Py_ssize_t _Py_RefTotal;
 #    define _Py_INC_REFTOTAL() _Py_RefTotal++
 #    define _Py_DEC_REFTOTAL() _Py_RefTotal--
-#  elif !defined(Py_LIMITED_API) || Py_LIMITED_API+0 > 0x030D0000
+#  elif !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030C0000
 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()

diff --git a/Lib/test/test_stable_abi_ctypes.py b/Lib/test/test_stable_abi_ctypes.py
index 4ca39d85e5460c938c3dadf6df3a557491460869..60ad3603ae92233c145cb98d01502c95f0a5255c 100644 (file)
--- a/Lib/test/test_stable_abi_ctypes.py
+++ b/Lib/test/test_stable_abi_ctypes.py
@@ -918,6 +918,8 @@ if feature_macros['PY_HAVE_THREAD_NATIVE_ID']:
     )
 if feature_macros['Py_REF_DEBUG']:
     SYMBOL_NAMES += (
+        '_Py_DecRefTotal_DO_NOT_USE_THIS',
+        '_Py_IncRefTotal_DO_NOT_USE_THIS',
         '_Py_NegativeRefcount',
         '_Py_RefTotal',
     )

diff --git a/Misc/stable_abi.toml b/Misc/stable_abi.toml
index 48299e9b35ff973b6fcc50ab1ba31f96976c46b1..1db98483f09f770a69cfd163b811ceaee843dd21 100644 (file)
--- a/Misc/stable_abi.toml
+++ b/Misc/stable_abi.toml
@@ -2406,3 +2406,12 @@
     added = '3.12'
 [const.Py_TPFLAGS_ITEMS_AT_END]
     added = '3.12'
+
+[function._Py_IncRefTotal_DO_NOT_USE_THIS]
+    added = '3.12'
+    ifdef = 'Py_REF_DEBUG'
+    abi_only = true
+[function._Py_DecRefTotal_DO_NOT_USE_THIS]
+    added = '3.12'
+    ifdef = 'Py_REF_DEBUG'
+    abi_only = true

diff --git a/PC/python3dll.c b/PC/python3dll.c
index 7e848abccfd1fa6484c13d7ac328492ee154819e..f2c0d9dee883d9936d82d1ee073fc794bdf4d8d8 100755 (executable)
--- a/PC/python3dll.c
+++ b/PC/python3dll.c
@@ -18,7 +18,9 @@ EXPORT_FUNC(_Py_BuildValue_SizeT)
 EXPORT_FUNC(_Py_CheckRecursiveCall)
 EXPORT_FUNC(_Py_Dealloc)
 EXPORT_FUNC(_Py_DecRef)
+EXPORT_FUNC(_Py_DecRefTotal_DO_NOT_USE_THIS)
 EXPORT_FUNC(_Py_IncRef)
+EXPORT_FUNC(_Py_IncRefTotal_DO_NOT_USE_THIS)
 EXPORT_FUNC(_Py_NegativeRefcount)
 EXPORT_FUNC(_Py_VaBuildValue_SizeT)
 EXPORT_FUNC(_PyArg_Parse_SizeT)