From ff65288aa89dcd50760ad942d58baff70c6e93e6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 16 May 2021 15:24:49 +0200 Subject: patch 8.2.2857: Vim9: exception in ISN_INSTR caught at wrong level Problem: Vim9: exception in ISN_INSTR caught at wrong level. Solution: Set the starting trylevel in exec_instructions(). (closes #8214) --- src/vim9execute.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/vim9execute.c') diff --git a/src/vim9execute.c b/src/vim9execute.c index ae4142b0c..425cdb9bb 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -1295,6 +1295,9 @@ exec_instructions(ectx_T *ectx) // Start execution at the first instruction. ectx->ec_iidx = 0; + // Only catch exceptions in this instruction list. + ectx->ec_trylevel_at_start = trylevel; + for (;;) { isn_T *iptr; @@ -4158,7 +4161,6 @@ call_def_function( ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10); ga_init2(&ectx.ec_funcrefs, sizeof(partial_T *), 10); ectx.ec_did_emsg_before = did_emsg_before; - ectx.ec_trylevel_at_start = trylevel; idx = argc - ufunc->uf_args.ga_len; if (idx > 0 && ufunc->uf_va_name == NULL) -- cgit v1.2.1