Skip to content

gh-130327: Always traverse managed dictionaries, even when inline values are available #130469

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
colesbury merged 17 commits into from
Mar 2, 2026
Merged

gh-130327: Always traverse managed dictionaries, even when inline values are available #130469

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8a29421
gh-130327: Only set the managed dictionary if there aren't inline values
ZeroIntensity Feb 20, 2025
e3cafb7
Add blurb.
ZeroIntensity Feb 20, 2025
671d3f7
Add a test case.
ZeroIntensity Feb 20, 2025
2fa09a9
Revert "gh-130327: Only set the managed dictionary if there aren't in…
ZeroIntensity Feb 22, 2025
07c4935
Treat the dictionary as owning values, not the object.
ZeroIntensity Feb 22, 2025
39e4a81
Check for validity of the values.
ZeroIntensity Feb 23, 2025
33808bc
Also check if they're embedded.
ZeroIntensity Feb 23, 2025
67bc92f
Swap the case to (hopefully) make CIFuzz happy.
ZeroIntensity Feb 23, 2025
5025d61
Fix negation of case.
ZeroIntensity Feb 23, 2025
ff42679
Use an atomic load.
ZeroIntensity Mar 25, 2025
34c9449
Merge branch 'main' into gh-130327-managed-dict-inline
ZeroIntensity Mar 25, 2025
719fbd1
Not sure what I was doing earlier but I think this works.
ZeroIntensity Jun 19, 2025
3929ac7
Fix merge conflicts.
ZeroIntensity Jun 19, 2025
c1d0cd2
Remove atomic load.
ZeroIntensity Jun 19, 2025
4ecf967
Back to square one.
ZeroIntensity Jun 19, 2025
5f2ab56
Merge branch 'main' into gh-130327-managed-dict-inline
colesbury Mar 2, 2026
ad71fab
Edit comment and remove early returns
colesbury Mar 2, 2026
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
Remove atomic load. 
I turned this into a mess when trying to debug the other crash.
  • Loading branch information
@ZeroIntensity
ZeroIntensity committed Jun 19, 2025
commit c1d0cd2155acf16f05d0aa04238a4e0f447bf7d5
2 changes: 1 addition & 1 deletion Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4619,7 +4619,7 @@ dict_traverse(PyObject *op, visitproc visit, void *arg)

if (DK_IS_UNICODE(keys)) {
if (_PyDict_HasSplitTable(mp)) {
if (!FT_ATOMIC_LOAD_UINT8(mp->ma_values->embedded)) {
if (!mp->ma_values->embedded) {
for (i = 0; i < n; i++) {
Py_VISIT(mp->ma_values->values[i]);
}
Expand Down