8000 bpo-42536: GC track recycled tuples by brandtbucher · Pull Request #23623 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-42536: GC track recycled tuples #23623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Dec 5, 2020
Merged

bpo-42536: GC track recycled tuples #23623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6f7abb3
Add failing regression test.
brandtbucher Dec 3, 2020
5c7b815
Re-track recyled result tuples.
brandtbucher Dec 3, 2020
c8f161a
Blurb add.
brandtbucher Dec 3, 2020
78d1c5d
Feedback from code review
brandtbucher Dec 3, 2020
698e337
Add failing regression test for enumerate
brandtbucher Dec 4, 2020
a41a132
Re-track recycled enumerate result tuples
brandtbucher Dec 4, 2020
8b7e96a
Add failing regression tests for dict.items
brandtbucher Dec 4, 2020
2ac50cf
Re-track recycled dict.items result tuples
brandtbucher Dec 4, 2020
f0aee47
Add failing regression test for OrderedDict.items
brandtbucher Dec 4, 2020
363256b
Re-track recycled OrderedDict.items result tuples
brandtbucher Dec 4, 2020
63db279
Add failing regression tests for itertools
brandtbucher Dec 4, 2020
027a51f
Re-track recycled itertools result tuples
brandtbucher Dec 4, 2020
4053bc6
Reword comments
brandtbucher Dec 4, 2020
83cdf03
Reword comments
brandtbucher Dec 4, 2020
3583ba4
Re-track recycled reduce arg tuples
brandtbucher Dec 4, 2020
1ac7590
Reword comments
brandtbucher Dec 4, 2020
6e12b8b
Remove comment
brandtbucher Dec 4, 2020
80f59e4
Update NEWS entry.
brandtbucher Dec 4, 2020
9005df4
Fix typo
brandtbucher Dec 4, 2020
6ec2368
Replace single-character names
brandtbucher Dec 4, 2020
dfcb32c
Group new itertools tests
brandtbucher Dec 4, 2020
06e05f4
Beef up the NEWS entry
brandtbucher Dec 4, 2020
60e7519
Fix doc build
brandtbucher Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace single-character names
  • Loading branch information
@brandtbucher
brandtbucher committed Dec 4, 2020
commit 6ec236882a61a56b84ea41ea8c2b24768b6ea8ee
4 changes: 2 additions & 2 deletions Lib/test/test_builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,12 +1762,12 @@ def test_zip_result_gc(self):
# bpo-42536: zip's tuple-reuse speed trick breaks the GC's assumptions
# about what can be untracked. Make sure we re-track result tuples
# whenever we reuse them.
z = zip([[]])
it = zip([[]])
gc.collect()
# That GC collection probably untracked the recycled internal result
# tuple, which is initialized to (None,). Make sure it's re-tracked when
# it's mutated and returned from __next__:
self.assertTrue(gc.is_tracked(next(z)))
self.assertTrue(gc.is_tracked(next(it)))

def test_format(self):
# Test the basic machinery of the format() builtin. Don't test
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,19 +1457,19 @@ def test_dict_items_result_gc(self):
# bpo-42536: dict.items's tuple-reuse speed trick breaks the GC's
# assumptions about what can be untracked. Make sure we re-track result
# tuples whenever we reuse them.
i = iter({None: []}.items())
it = iter({None: []}.items())
gc.collect()
# That GC collection probably untracked the recycled internal result
# tuple, which is initialized to (None, None). Make sure it's re-tracked
# when it's mutated and returned from __next__:
self.assertTrue(gc.is_tracked(next(i)))
self.assertTrue(gc.is_tracked(next(it)))

@support.cpython_only
def test_dict_items_result_gc(self):
# Same as test_dict_items_result_gc above, but reversed.
i = reversed({None: []}.items())
it = reversed({None: []}.items())
gc.collect()
self.assertTrue(gc.is_tracked(next(i)))
self.assertTrue(gc.is_tracked(next(it)))


class CAPITest(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_enumerate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ def test_enumerate_result_gc(self):
# bpo-42536: enumerate's tuple-reuse speed trick breaks the GC's
# assumptions about what can be untracked. Make sure we re-track result
# tuples whenever we reuse them.
e = self.enum([[]])
it = self.enum([[]])
gc.collect()
# That GC collection probably untracked the recycled internal result
# tuple, which is initialized to (None, None). Make sure it's re-tracked
# when it's mutated and returned from __next__:
self.assertTrue(gc.is_tracked(next(e)))
self.assertTrue(gc.is_tracked(next(it)))

class MyEnum(enumerate):
pass
Expand Down
28 changes: 14 additions & 14 deletions Lib/test/test_itertools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,13 @@ def test_combinations_result_gc(self):
# bpo-42536: combinations's tuple-reuse speed trick breaks the GC's
# assumptions about what can be untracked. Make sure we re-track result
# tuples whenever we reuse them.
c = combinations([None, []], 1)
next(c)
it = combinations([None, []], 1)
next(it)
gc.collect()
# That GC collection probably untracked the recycled internal result
# tuple, which has the value (None,). Make sure it's re-tracked when
# it's mutated and returned from __next__:
self.assertTrue(gc.is_tracked(next(c)))
self.assertTrue(gc.is_tracked(next(it)))

def test_combinations_with_replacement(self):
cwr = combinations_with_replacement
Expand Down Expand Up @@ -401,10 +401,10 @@ def test_combinations_with_replacement_tuple_reuse(self):
def test_combinations_with_replacement_result_gc(self):
# Same as test_combinations_result_gc above, but for
# combinations_with_replacement.
c = combinations_with_replacement([None, []], 1)
next(c)
it = combinations_with_replacement([None, []], 1)
next(it)
gc.collect()
self.assertTrue(gc.is_tracked(next(c)))
self.assertTrue(gc.is_tracked(next(it)))

def test_permutations(self):
self.assertRaises(TypeError, permutations) # too few arguments
Expand Down Expand Up @@ -482,10 +482,10 @@ def test_permutations_tuple_reuse(self):
@support.cpython_only
def test_permutations_result_gc(self):
# Same as test_combinations_result_gc above, but for permutations.
p = permutations([None, []], 1)
next(p)
it = permutations([None, []], 1)
next(it)
gc.collect()
self.assertTrue(gc.is_tracked(next(p)))
self.assertTrue(gc.is_tracked(next(it)))

def test_combinatorics(self):
# Test relationships between product(), permutations(),
Expand Down Expand Up @@ -1000,9 +1000,9 @@ def test_zip_longest_tuple_reuse(self):
@support.cpython_only
def test_zip_longest_result_gc(self):
# Same as test_combinations_result_gc above, but for zip_longest.
z = zip_longest([[]])
it = zip_longest([[]])
gc.collect()
self.assertTrue(gc.is_tracked(next(z)))
self.assertTrue(gc.is_tracked(next(it)))

def test_zip_longest_pickling(self):
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
Expand Down Expand Up @@ -1153,10 +1153,10 @@ def test_product_tuple_reuse(self):
@support.cpython_only
def test_product_result_gc(self):
# Same as test_combinations_result_gc above, but for product.
p = product([None, []])
next(p)
it = product([None, []])
next(it)
gc.collect()
self.assertTrue(gc.is_tracked(next(p)))
self.assertTrue(gc.is_tracked(next(it)))

def test_product_pickling(self):
# check copy, deepcopy, pickle
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_ordered_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,12 +705,12 @@ def test_ordered_dict_items_result_gc(self):
# bpo-42536: OrderedDict.items's tuple-reuse speed trick breaks the GC's
# assumptions about what can be untracked. Make sure we re-track result
# tuples whenever we reuse them.
i = iter(self.OrderedDict({None: []}).items())
it = iter(self.OrderedDict({None: []}).items())
gc.collect()
# That GC collection probably untracked the recycled internal result
# tuple, which is initialized to (None, None). Make sure it's re-tracked
# when it's mutated and returned from __next__:
self.assertTrue(gc.is_tracked(next(i)))
self.assertTrue(gc.is_tracked(next(it)))

class PurePythonOrderedDictTests(OrderedDictTests, unittest.TestCase):

Expand Down
0