TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/runtime: Fix PEP479 behaviour throwing StopIteration into yield from.

Browse Source 
Commit 3f6ffe059f implemented PEP479 but did
not catch the case fixed in this commit.  Found by coverage analysis, that
the VM had uncovered code.
This commit is contained in:
Damien George
2019-09-30 16:06:20 +10:00
parent 82c494a97e
commit 809d89c794
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
py/vm.c
View File

@@ -1266,17 +1266,10 @@ yield:
DISPATCH();
} else {
assert(ret_kind == MP_VM_RETURN_EXCEPTION);
assert(!EXC_MATCH(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration)));
// Pop exhausted gen
sp--;
if (EXC_MATCH(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {
PUSH(mp_obj_exception_get_value(ret_value));
// If we injected GeneratorExit downstream, then even
// if it was swallowed, we re-raise GeneratorExit
GENERATOR_EXIT_IF_NEEDED(t_exc);
DISPATCH();
} else {
RAISE(ret_value);
}
RAISE(ret_value);
}
}