diff options
| author | Damien George <damien.p.george@gmail.com> | 2019-08-21 16:08:43 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-08-28 12:31:53 +1000 |
| commit | 08c1fe556915c912598d5a5d5db0f5942f3a333d (patch) | |
| tree | 454282f0dc4875632c9d3e3881b257e5918736dd /py/vm.c | |
| parent | 16f6169c88a5fd93b151149e561d177557fcc760 (diff) | |
py/vm: Don't add traceback info for exceptions that are re-raised.
With this patch exceptions that are re-raised have improved tracebacks
(less confusing, match CPython), and it makes re-raise slightly more
efficient (in time and RAM) because they no longer need to add a traceback.
Also general VM performance is not measurably affected.
Partially fixes issue #2928.
Diffstat (limited to 'py/vm.c')
| -rw-r--r-- | py/vm.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1362,8 +1362,10 @@ unwind_loop: // Set traceback info (file and line number) where the exception occurred, but not for: // - constant GeneratorExit object, because it's const // - exceptions re-raised by END_FINALLY + // - exceptions re-raised explicitly by "raise" if (nlr.ret_val != &mp_const_GeneratorExit_obj - && *code_state->ip != MP_BC_END_FINALLY) { + && *code_state->ip != MP_BC_END_FINALLY + && !(*code_state->ip == MP_BC_RAISE_VARARGS && code_state->ip[1] == 0)) { const byte *ip = code_state->fun_bc->bytecode; ip = mp_decode_uint_skip(ip); // skip n_state ip = mp_decode_uint_skip(ip); // skip n_exc_stack |