merge 3.4-slp (fix an uninitialized variable)

Anselm Kruis · Anselm Kruis · commit f82f0d3e2706 · 2017-03-12T19:09:25.000+01:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3464,6 +3464,7 @@ slp_eval_frame_value(PyFrameObject *f, int throwflag, PyObject *retval)
                 goto stackless_iter;
 stackless_iter_return:
                 next = retval;
+                iter = TOP();
             }
 #else
             next = (*iter->ob_type->tp_iternext)(iter);

Original file line number	Diff line number	Diff line change
`@@ -3464,6 +3464,7 @@ slp_eval_frame_value(PyFrameObject f, int throwflag, PyObject retval)`
`3464`	`3464`	`goto stackless_iter;`
`3465`	`3465`	`stackless_iter_return:`
`3466`	`3466`	`next = retval;`
	`3467`	`+ iter = TOP();`
`3467`	`3468`	`}`
`3468`	`3469`	`#else`
`3469`	`3470`	`next = (*iter->ob_type->tp_iternext)(iter);`