mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

GH-104142: Fix _Py_RefcntAdd to respect immortality (GH-104143)

Browse source
This commit is contained in:
Brandt Bucher 2023-05-04 17:00:07 -07:00 • committed by GitHub
parent fa86a77589
commit ce871fdc3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/internal/pycore_object.h
View file

@ -58,6 +58,9 @@ extern void _Py_DecRefTotal(PyInterpreterState *);
// Increment reference count by n // Increment reference count by n
static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n) static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n)
{ {
if (_Py_IsImmortal(op)) {
return;
}
#ifdef Py_REF_DEBUG #ifdef Py_REF_DEBUG
_Py_AddRefTotal(_PyInterpreterState_GET(), n); _Py_AddRefTotal(_PyInterpreterState_GET(), n);
#endif #endif

39
Lib/test/test_builtin.py
View file

@ -2372,24 +2372,31 @@ class ShutdownTest(unittest.TestCase):
@cpython_only @cpython_only
class ImmortalTests(unittest.TestCase): class ImmortalTests(unittest.TestCase):
def test_immortal(self):
none_refcount = sys.getrefcount(None)
true_refcount = sys.getrefcount(True)
false_refcount = sys.getrefcount(False)
smallint_refcount = sys.getrefcount(100)
# Assert that all of these immortal instances have large ref counts. if sys.maxsize < (1 << 32):
self.assertGreater(none_refcount, 2 ** 15) IMMORTAL_REFCOUNT = (1 << 30) - 1
self.assertGreater(true_refcount, 2 ** 15) else:
self.assertGreater(false_refcount, 2 ** 15) IMMORTAL_REFCOUNT = (1 << 32) - 1
self.assertGreater(smallint_refcount, 2 ** 15)
# Confirm that the refcount doesn't change even with a new ref to them. IMMORTALS = (None, True, False, Ellipsis, NotImplemented, *range(-5, 257))
l = [None, True, False, 100]
self.assertEqual(sys.getrefcount(None), none_refcount) def assert_immortal(self, immortal):
self.assertEqual(sys.getrefcount(True), true_refcount) with self.subTest(immortal):
self.assertEqual(sys.getrefcount(False), false_refcount) self.assertEqual(sys.getrefcount(immortal), self.IMMORTAL_REFCOUNT)
self.assertEqual(sys.getrefcount(100), smallint_refcount)
def test_immortals(self):
for immortal in self.IMMORTALS:
self.assert_immortal(immortal)
def test_list_repeat_respect_immortality(self):
refs = list(self.IMMORTALS) * 42
for immortal in self.IMMORTALS:
self.assert_immortal(immortal)
def test_tuple_repeat_respect_immortality(self):
refs = tuple(self.IMMORTALS) * 42
for immortal in self.IMMORTALS:
self.assert_immortal(immortal)
class TestType(unittest.TestCase): class TestType(unittest.TestCase):

2
Misc/NEWS.d/next/Core and Builtins/2023-05-02-18-29-49.gh-issue-104142._5Et6I.rst Normal file
View file

@ -0,0 +1,2 @@
Fix an issue where :class:`list` or :class:`tuple` repetition could fail to
respect :pep:`683`.