Skip to content

GH-145247: Use _PyTuple_FromPair[Steal] in Objects #145884

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
vstinner merged 16 commits into from
Mar 28, 2026
Merged

GH-145247: Use _PyTuple_FromPair[Steal] in Objects #145884

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eb71cca
Use _PyTuple_FromPair[Steal] in Objects
sergey-miryanov Mar 12, 2026
8a189d8
Address review
sergey-miryanov Mar 23, 2026
db20d92
Merge branch 'main' into feat/145247-pytuple-from-pair-use-2
sergey-miryanov Mar 23, 2026
5c295d3
Remove wrong decref
sergey-miryanov Mar 23, 2026
7e45fc5
Merge branch 'feat/145247-pytuple-from-pair-use-2' of github.com:serg…
sergey-miryanov Mar 23, 2026
5055af7
Apply suggestions from code review
sergey-miryanov Mar 27, 2026
0fc920f
Fix warnings
sergey-miryanov Mar 27, 2026
36d7afc
Fix memory leaks
sergey-miryanov Mar 27, 2026
b1c6388
Rename error label
sergey-miryanov Mar 27, 2026
a649f9e
Added error label
sergey-miryanov Mar 27, 2026
83cc582
Remove unused variable
sergey-miryanov Mar 27, 2026
5db1922
Fix possible memory leak
sergey-miryanov Mar 27, 2026
0b03537
Apply suggestions from code review
sergey-miryanov Mar 27, 2026
7ed7b94
Address review
sergey-miryanov Mar 27, 2026
1b4df92
Variables already null after while loop
sergey-miryanov Mar 27, 2026
06a01eb
Address review
sergey-miryanov Mar 27, 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
Address review
  • Loading branch information
@sergey-miryanov
sergey-miryanov committed Mar 27, 2026
commit 06a01eb1827dcd3f31094271382ae2cd1b7b1f32
4 changes: 2 additions & 2 deletions Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6632,17 +6632,18 @@ dictitems_xor_lock_held(PyObject *d1, PyObject *d2)
else {
Py_INCREF(val1);
to_delete = PyObject_RichCompareBool(val1, val2, Py_EQ);
Comment thread
vstinner marked this conversation as resolved.
Py_CLEAR(val1);
if (to_delete < 0) {
goto error;
Comment thread
vstinner marked this conversation as resolved.
}
}

if (to_delete) {
Py_CLEAR(val2);
if (_PyDict_DelItem_KnownHash(temp_dict, key, hash) < 0) {
goto error;
}
Py_CLEAR(key);
Py_CLEAR(val2);
}
else {
PyObject *pair = _PyTuple_FromPairSteal(key, val2);
Expand All @@ -6656,7 +6657,6 @@ dictitems_xor_lock_held(PyObject *d1, PyObject *d2)
}
Py_DECREF(pair);
}
Py_CLEAR(val1);
}

PyObject *remaining_pairs = PyObject_CallMethodNoArgs(
Expand Down
Loading