thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3078: Vim9: profile test fails

Browse Source 
Problem:    Vim9: profile test fails.
Solution:   Make throw in :catch jump to :finally.
This commit is contained in:
Bram Moolenaar
2021-06-30 20:39:15 +02:00
parent d3d8feeb89
commit 834193afd7
4 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vim9execute.c
View File

@@ -1577,7 +1577,7 @@ exec_instructions(ectx_T *ectx)
while (index > 0)
{
trycmd = ((trycmd_T *)trystack->ga_data) + index - 1;
if (!trycmd->tcd_in_catch)
if (!trycmd->tcd_in_catch || trycmd->tcd_finally_idx != 0)
break;
// In the catch and finally block of this try we have to go up
// one level.
@@ -1586,9 +1586,16 @@ exec_instructions(ectx_T *ectx)
}
if (trycmd != NULL && trycmd->tcd_frame_idx == ectx->ec_frame_idx)
{
// jump to ":catch" or ":finally"
if (trycmd->tcd_in_catch)
{
// exception inside ":catch", jump to ":finally" once
ectx->ec_iidx = trycmd->tcd_finally_idx;
trycmd->tcd_finally_idx = 0;
}
else
// jump to first ":catch"
ectx->ec_iidx = trycmd->tcd_catch_idx;
trycmd->tcd_in_catch = TRUE;
ectx->ec_iidx = trycmd->tcd_catch_idx;
did_throw = FALSE; // don't come back here until :endtry
trycmd->tcd_did_throw = TRUE;
}