Issue #16191: Fix up references to renamed variables

This commit is contained in:
Martin Panter 2016-07-18 08:23:26 +00:00
parent 371731ebfd
commit 95f53c13ce
1 changed files with 6 additions and 6 deletions

View File

@ -1563,7 +1563,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
if (PyUnicode_CheckExact(left) && if (PyUnicode_CheckExact(left) &&
PyUnicode_CheckExact(right)) { PyUnicode_CheckExact(right)) {
sum = unicode_concatenate(left, right, f, next_instr); sum = unicode_concatenate(left, right, f, next_instr);
/* unicode_concatenate consumed the ref to v */ /* unicode_concatenate consumed the ref to left */
} }
else { else {
sum = PyNumber_Add(left, right); sum = PyNumber_Add(left, right);
@ -1762,7 +1762,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PyObject *sum; PyObject *sum;
if (PyUnicode_CheckExact(left) && PyUnicode_CheckExact(right)) { if (PyUnicode_CheckExact(left) && PyUnicode_CheckExact(right)) {
sum = unicode_concatenate(left, right, f, next_instr); sum = unicode_concatenate(left, right, f, next_instr);
/* unicode_concatenate consumed the ref to v */ /* unicode_concatenate consumed the ref to left */
} }
else { else {
sum = PyNumber_InPlaceAdd(left, right); sum = PyNumber_InPlaceAdd(left, right);
@ -1853,7 +1853,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PyObject *v = THIRD(); PyObject *v = THIRD();
int err; int err;
STACKADJ(-3); STACKADJ(-3);
/* v[w] = u */ /* container[sub] = v */
err = PyObject_SetItem(container, sub, v); err = PyObject_SetItem(container, sub, v);
Py_DECREF(v); Py_DECREF(v);
Py_DECREF(container); Py_DECREF(container);
@ -1868,7 +1868,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PyObject *container = SECOND(); PyObject *container = SECOND();
int err; int err;
STACKADJ(-2); STACKADJ(-2);
/* del v[w] */ /* del container[sub] */
err = PyObject_DelItem(container, sub); err = PyObject_DelItem(container, sub);
Py_DECREF(container); Py_DECREF(container);
Py_DECREF(sub); Py_DECREF(sub);
@ -2107,7 +2107,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
SET_TOP(val); SET_TOP(val);
DISPATCH(); DISPATCH();
} }
/* x remains on stack, retval is value to be yielded */ /* receiver remains on stack, retval is value to be yielded */
f->f_stacktop = stack_pointer; f->f_stacktop = stack_pointer;
why = WHY_YIELD; why = WHY_YIELD;
/* and repeat... */ /* and repeat... */
@ -2728,7 +2728,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
STACKADJ(-2); STACKADJ(-2);
map = stack_pointer[-oparg]; /* dict */ map = stack_pointer[-oparg]; /* dict */
assert(PyDict_CheckExact(map)); assert(PyDict_CheckExact(map));
err = PyDict_SetItem(map, key, value); /* v[w] = u */ err = PyDict_SetItem(map, key, value); /* map[key] = value */
Py_DECREF(value); Py_DECREF(value);
Py_DECREF(key); Py_DECREF(key);
if (err != 0) if (err != 0)