traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only update the arr variable when PyObject_RichCompareBool() has been called.

This commit is contained in:
Raymond Hettinger 2015-12-07 20:45:16 -08:00
parent e7ceef66dd
commit 2300bf29e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_heapqmodule.c
View File

@ -78,6 +78,7 @@ siftup(PyListObject *heap, Py_ssize_t pos)
if (cmp < 0) if (cmp < 0)
return -1; return -1;
childpos += ((unsigned)cmp ^ 1); /* increment when cmp==0 */ childpos += ((unsigned)cmp ^ 1); /* increment when cmp==0 */
arr = _PyList_ITEMS(heap); /* arr may have changed */
if (endpos != PyList_GET_SIZE(heap)) { if (endpos != PyList_GET_SIZE(heap)) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"list changed size during iteration"); "list changed size during iteration");
@ -85,7 +86,6 @@ siftup(PyListObject *heap, Py_ssize_t pos)
} }
} }
/* Move the smaller child up. */ /* Move the smaller child up. */
arr = _PyList_ITEMS(heap);
tmp1 = arr[childpos]; tmp1 = arr[childpos];
tmp2 = arr[pos]; tmp2 = arr[pos];
arr[childpos] = tmp2; arr[childpos] = tmp2;
@ -432,6 +432,7 @@ siftup_max(PyListObject *heap, Py_ssize_t pos)
if (cmp < 0) if (cmp < 0)
return -1; return -1;
childpos += ((unsigned)cmp ^ 1); /* increment when cmp==0 */ childpos += ((unsigned)cmp ^ 1); /* increment when cmp==0 */
arr = _PyList_ITEMS(heap); /* arr may have changed */
if (endpos != PyList_GET_SIZE(heap)) { if (endpos != PyList_GET_SIZE(heap)) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"list changed size during iteration"); "list changed size during iteration");
@ -439,7 +440,6 @@ siftup_max(PyListObject *heap, Py_ssize_t pos)
} }
} }
/* Move the smaller child up. */ /* Move the smaller child up. */
arr = _PyList_ITEMS(heap);
tmp1 = arr[childpos]; tmp1 = arr[childpos];
tmp2 = arr[pos]; tmp2 = arr[pos];
arr[childpos] = tmp2; arr[childpos] = tmp2;