py/vm: Fix bug with stackless mode and unwinding of exceptions.

dpgeorge · dpgeorge · commit 68e71eacb8f5 · 2017-05-25T20:35:57.000+10:00
This patch fixes a regression introduced by 71a3d6e Previous to this patch the n_state variable was referring to that computed at the very start of the mp_execute_bytecode function. This patch fixes it so that n_state is recomputed when the code_state changes.
diff --git a/py/vm.c b/py/vm.c
@@ -1436,6 +1436,7 @@ unwind_jump:;
             } else if (code_state->prev != NULL) {
                 mp_globals_set(code_state->old_globals);
                 code_state = code_state->prev;
+                size_t n_state = mp_decode_uint_value(code_state->fun_bc->bytecode);
                 fastn = &code_state->state[n_state - 1];
                 exc_stack = (mp_exc_stack_t*)(code_state->state + n_state);
                 // variables that are visible to the exception handler (declared volatile)
