patch 8.2.2543: Vim9: a return inside try/catch does not restore properly
Problem: Vim9: a return inside try/catch does not restore exception state
properly.
Solution: When there is no ":finally" jump to ":endtry". (closes #7882)
diff --git a/src/vim9execute.c b/src/vim9execute.c
index d2cc62f..232f047 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2517,11 +2517,13 @@
trycmd = ((trycmd_T *)trystack->ga_data)
+ trystack->ga_len - 1;
if (trycmd != NULL
- && trycmd->tcd_frame_idx == ectx.ec_frame_idx
- && trycmd->tcd_finally_idx != 0)
+ && trycmd->tcd_frame_idx == ectx.ec_frame_idx)
{
- // jump to ":finally" once
- ectx.ec_iidx = trycmd->tcd_finally_idx;
+ // jump to ":finally" or ":endtry"
+ if (trycmd->tcd_finally_idx != 0)
+ ectx.ec_iidx = trycmd->tcd_finally_idx;
+ else
+ ectx.ec_iidx = trycmd->tcd_endtry_idx;
trycmd->tcd_return = TRUE;
}
else