Skip to content

bpo-29202: improve dict iteration #11900

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
methane merged 1 commit into from
Apr 5, 2019
Merged

bpo-29202: improve dict iteration #11900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,7 +2090,7 @@ dict_keys(PyDictObject *mp)
PyObject *v;
Py_ssize_t i, j;
PyDictKeyEntry *ep;
Py_ssize_t size, n, offset;
Py_ssize_t n, offset;
PyObject **value_ptr;

again:
Expand All @@ -2106,7 +2106,6 @@ dict_keys(PyDictObject *mp)
goto again;
}
ep = DK_ENTRIES(mp->ma_keys);
size = mp->ma_keys->dk_nentries;
if (mp->ma_values) {
value_ptr = mp->ma_values;
offset = sizeof(PyObject *);
Expand All @@ -2115,7 +2114,7 @@ dict_keys(PyDictObject *mp)
value_ptr = &ep[0].me_value;
offset = sizeof(PyDictKeyEntry);
}
for (i = 0, j = 0; i < size; i++) {
for (i = 0, j = 0; j < n; i++) {
if (*value_ptr != NULL) {
PyObject *key = ep[i].me_key;
Py_INCREF(key);
Expand All @@ -2134,7 +2133,7 @@ dict_values(PyDictObject *mp)
PyObject *v;
Py_ssize_t i, j;
PyDictKeyEntry *ep;
Py_ssize_t size, n, offset;
Py_ssize_t n, offset;
PyObject **value_ptr;

again:
Expand All @@ -2150,7 +2149,6 @@ dict_values(PyDictObject *mp)
goto again;
}
ep = DK_ENTRIES(mp->ma_keys);
size = mp->ma_keys->dk_nentries;
if (mp->ma_values) {
value_ptr = mp->ma_values;
offset = sizeof(PyObject *);
Expand All @@ -2159,7 +2157,7 @@ dict_values(PyDictObject *mp)
value_ptr = &ep[0].me_value;
offset = sizeof(PyDictKeyEntry);
}
for (i = 0, j = 0; i < size; i++) {
for (i = 0, j = 0; j < n; i++) {
PyObject *value = *value_ptr;
value_ptr = (PyObject **)(((char *)value_ptr) + offset);
if (value != NULL) {
Expand All @@ -2177,7 +2175,7 @@ dict_items(PyDictObject *mp)
{
PyObject *v;
Py_ssize_t i, j, n;
Py_ssize_t size, offset;
Py_ssize_t offset;
PyObject *item, *key;
PyDictKeyEntry *ep;
PyObject **value_ptr;
Expand Down Expand Up @@ -2208,7 +2206,6 @@ dict_items(PyDictObject *mp)
}
/* Nothing we do below makes any function calls. */
ep = DK_ENTRIES(mp->ma_keys);
size = mp->ma_keys->dk_nentries;
if (mp->ma_values) {
value_ptr = mp->ma_values;
offset = sizeof(PyObject *);
Expand All @@ -2217,7 +2214,7 @@ dict_items(PyDictObject *mp)
value_ptr = &ep[0].me_value;
offset = sizeof(PyDictKeyEntry);
}
for (i = 0, j = 0; i < size; i++) {
for (i = 0, j = 0; j < n; i++) {
PyObject *value = *value_ptr;
value_ptr = (PyObject **)(((char *)value_ptr) + offset);
if (value != NULL) {
Expand Down