py/compile: Fix handling of unwinding BaseException in async with.

All exceptions that unwind through the async-with must be caught and
BaseException is the top-level class, which includes Exception and others.

Fixes issue #4552.
This commit is contained in:
Damien George 2019-02-26 13:47:14 +11:00
parent 823b31e528
commit 12ce9f2689
3 changed files with 14 additions and 1 deletions

View File

@ -1830,7 +1830,7 @@ STATIC void compile_async_with_stmt_helper(compiler_t *comp, int n, mp_parse_nod
// Detect if TOS an exception or not // Detect if TOS an exception or not
EMIT(dup_top); EMIT(dup_top);
EMIT_LOAD_GLOBAL(MP_QSTR_Exception); EMIT_LOAD_GLOBAL(MP_QSTR_BaseException);
EMIT_ARG(binary_op, MP_BINARY_OP_EXCEPTION_MATCH); EMIT_ARG(binary_op, MP_BINARY_OP_EXCEPTION_MATCH);
EMIT_ARG(pop_jump_if, false, l_ret_unwind_jump); // if not an exception then we have case 3 EMIT_ARG(pop_jump_if, false, l_ret_unwind_jump); // if not an exception then we have case 3

View File

@ -27,3 +27,13 @@ try:
o.send(None) o.send(None)
except ValueError: except ValueError:
print('ValueError') print('ValueError')
# test raising BaseException to make sure it is handled by the async-with
async def h():
async with AContext():
raise BaseException
o = h()
try:
o.send(None)
except BaseException:
print('BaseException')

View File

@ -6,3 +6,6 @@ enter
1 1
exit <class 'ValueError'> error exit <class 'ValueError'> error
ValueError ValueError
enter
exit <class 'BaseException'>
BaseException