10000 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

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
Re-track recycled dict.items result tuples
  • Loading branch information
@brandtbucher
brandtbucher committed Dec 4, 2020
commit 2ac50cffc315a4d98543b0a561ab628f2c3596e9
13 changes: 13 additions & 0 deletions Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3989,6 +3989,12 @@ dictiter_iternextitem(dictiterobject *di)
Py_INCREF(result);
Py_DECREF(oldkey);
Py_DECREF(oldvalue);
// bpo-42536
// The GC may have untracked this result tuple if its elements were all
// untracked. Since we're recycling it, make sure it's tracked again:
if (!_PyObject_GC_IS_TRACKED(result)) {
_PyObject_GC_TRACK(result);
}
}
else {
result = PyTuple_New(2);
Expand Down Expand Up @@ -4104,6 +4110,13 @@ dictreviter_iternext(dictiterobject *di)
Py_INCREF(result);
Py_DECREF(oldkey);
Py_DECREF(oldvalue);
// bpo-42536
// The GC may have untracked this result tuple if its elements were
// all untracked. Since we're recycling it, make sure it's tracked
// again:
4CBB if (!_PyObject_GC_IS_TRACKED(result)) {
_PyObject_GC_TRACK(result);
}
}
else {
result = PyTuple_New(2);
Expand Down
0