aboutsummaryrefslogtreecommitdiff
path: root/py/objgenerator.c
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2021-06-29 22:39:24 +1000
committerDamien George <damien@micropython.org>2021-07-15 00:12:41 +1000
commitb8255dd2e00f926106083de7a9b41869b226e96b (patch)
tree8da297bf82457a2527e303b45362415bcd7eb5b1 /py/objgenerator.c
parent22fdb2130284ddea3ebe1d271d05d670546e788f (diff)
py/vm: Simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'py/objgenerator.c')
-rw-r--r--py/objgenerator.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 543685fac..1ee7b8b1d 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -152,8 +152,9 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
mp_check_self(mp_obj_is_type(self_in, &mp_type_gen_instance));
mp_obj_gen_instance_t *self = MP_OBJ_TO_PTR(self_in);
if (self->code_state.ip == 0) {
- // Trying to resume already stopped generator
- *ret_val = MP_OBJ_STOP_ITERATION;
+ // Trying to resume an already stopped generator.
+ // This is an optimised "raise StopIteration(None)".
+ *ret_val = mp_const_none;
return MP_VM_RETURN_NORMAL;
}
@@ -212,6 +213,7 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
// subsequent next() may re-execute statements after last yield
// again and again, leading to side effects.
self->code_state.ip = 0;
+ // This is an optimised "raise StopIteration(*ret_val)".
*ret_val = *self->code_state.sp;
break;