summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
Diffstat (limited to 'py')
-rw-r--r--py/modthread.c1
-rw-r--r--py/mpstate.h6
2 files changed, 5 insertions, 2 deletions
diff --git a/py/modthread.c b/py/modthread.c
index 6b7547490..e4dcccd25 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -174,6 +174,7 @@ STATIC void *thread_entry(void *args_in) {
// The GC starts off unlocked on this thread.
ts.gc_lock_depth = 0;
+ ts.nlr_jump_callback_top = NULL;
ts.mp_pending_exception = MP_OBJ_NULL;
// set locals and globals from the calling context
diff --git a/py/mpstate.h b/py/mpstate.h
index 64915ab87..0e0388e41 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -249,8 +249,10 @@ typedef struct _mp_state_vm_t {
#endif
} mp_state_vm_t;
-// This structure holds state that is specific to a given thread.
-// Everything in this structure is scanned for root pointers.
+// This structure holds state that is specific to a given thread. Everything
+// in this structure is scanned for root pointers. Anything added to this
+// structure must have corresponding initialisation added to thread_entry (in
+// py/modthread.c).
typedef struct _mp_state_thread_t {
// Stack top at the start of program
char *stack_top;