vm: Save current active exception on opening new try block.

Required to reraise correct exceptions in except block, regardless if more
try blocks with active exceptions happen in the same except block.

P.S. This "automagic reraise" appears to be quite wasteful feature of Python
- we need to save pending exception just in case it *might* be reraised.
Instead, programmer could explcitly capture exception to a variable using
"except ... as var", and reraise that. So, consider disabling argless raise
support as an optimization.

1 files changed, 2 insertions, 0 deletions

diff --git a/py/bc.h b/py/bc.h
index 065daece47..d7e6aa70eb 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -9,6 +9,8 @@ typedef struct _mp_exc_stack {
     const byte *handler;
     // bit 0 is saved currently_in_except_block value
     mp_obj_t *val_sp;
+    // Saved exception, valid if currently_in_except_block bit is 1
+    mp_obj_t prev_exc;
     // We might only have 2 interesting cases here: SETUP_EXCEPT & SETUP_FINALLY,
     // consider storing it in bit 1 of val_sp. TODO: SETUP_WITH?
     byte opcode;