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

patch 8.2.2263: Vim9: compilation error with try-catch in skipped block

Browse Source 
Problem:    Vim9: compilation error with try-catch in skipped block.
Solution:   Do not bail out when generate_instr() returns NULL. (closes #7584)
This commit is contained in:
Bram Moolenaar 2021-01-01 16:10:46 +01:00
parent a8b8af19e4
commit 69f7050ceb
3 changed files with 79 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/testdir/test_vim9_script.vim
View File

@ -361,6 +361,35 @@ def Test_try_catch()
endtry endtry
assert_equal(99, n) assert_equal(99, n)
var done = 'no'
if 0
try | catch | endtry
else
done = 'yes'
endif
assert_equal('yes', done)
done = 'no'
if 1
done = 'yes'
else
try | catch | endtry
done = 'never'
endif
assert_equal('yes', done)
if 1
else
try | catch /pat/ | endtry
try | catch /pat/
endtry
try
catch /pat/ | endtry
try
catch /pat/
endtry
endif
try try
# string slice returns a string, not a number # string slice returns a string, not a number
n = g:astring[3] n = g:astring[3]

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2263,
/**/ /**/
2262, 2262,
/**/ /**/

86
src/vim9compile.c
View File

@ -6916,11 +6916,14 @@ compile_try(char_u *arg, cctx_T *cctx)
if (try_scope == NULL) if (try_scope == NULL)
return NULL; return NULL;
// "catch" is set when the first ":catch" is found. if (cctx->ctx_skip != SKIP_YES)
// "finally" is set when ":finally" or ":endtry" is found {
try_scope->se_u.se_try.ts_try_label = instr->ga_len; // "catch" is set when the first ":catch" is found.
if (generate_instr(cctx, ISN_TRY) == NULL) // "finally" is set when ":finally" or ":endtry" is found
return NULL; try_scope->se_u.se_try.ts_try_label = instr->ga_len;
if (generate_instr(cctx, ISN_TRY) == NULL)
return NULL;
}
// scope for the try block itself // scope for the try block itself
scope = new_scope(cctx, BLOCK_SCOPE); scope = new_scope(cctx, BLOCK_SCOPE);
@ -6959,20 +6962,23 @@ compile_catch(char_u *arg, cctx_T *cctx UNUSED)
return NULL; return NULL;
} }
// Jump from end of previous block to :finally or :endtry if (cctx->ctx_skip != SKIP_YES)
if (compile_jump_to_end(&scope->se_u.se_try.ts_end_label,
JUMP_ALWAYS, cctx) == FAIL)
return NULL;
// End :try or :catch scope: set value in ISN_TRY instruction
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
if (isn->isn_arg.try.try_catch == 0)
isn->isn_arg.try.try_catch = instr->ga_len;
if (scope->se_u.se_try.ts_catch_label != 0)
{ {
// Previous catch without match jumps here // Jump from end of previous block to :finally or :endtry
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label; if (compile_jump_to_end(&scope->se_u.se_try.ts_end_label,
isn->isn_arg.jump.jump_where = instr->ga_len; JUMP_ALWAYS, cctx) == FAIL)
return NULL;
// End :try or :catch scope: set value in ISN_TRY instruction
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
if (isn->isn_arg.try.try_catch == 0)
isn->isn_arg.try.try_catch = instr->ga_len;
if (scope->se_u.se_try.ts_catch_label != 0)
{
// Previous catch without match jumps here
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
isn->isn_arg.jump.jump_where = instr->ga_len;
}
} }
p = skipwhite(arg); p = skipwhite(arg);
@ -7019,7 +7025,7 @@ compile_catch(char_u *arg, cctx_T *cctx UNUSED)
return NULL; return NULL;
} }
if (generate_instr(cctx, ISN_CATCH) == NULL) if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_CATCH) == NULL)
return NULL; return NULL;
if (new_scope(cctx, BLOCK_SCOPE) == NULL) if (new_scope(cctx, BLOCK_SCOPE) == NULL)
@ -7097,33 +7103,37 @@ compile_endtry(char_u *arg, cctx_T *cctx)
return NULL; return NULL;
} }
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label; if (cctx->ctx_skip != SKIP_YES)
if (isn->isn_arg.try.try_catch == 0 && isn->isn_arg.try.try_finally == 0)
{ {
emsg(_(e_missing_catch_or_finally)); isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
return NULL; if (isn->isn_arg.try.try_catch == 0
} && isn->isn_arg.try.try_finally == 0)
{
emsg(_(e_missing_catch_or_finally));
return NULL;
}
// Fill in the "end" label in jumps at the end of the blocks, if not done // Fill in the "end" label in jumps at the end of the blocks, if not
// by ":finally". // done by ":finally".
compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label, cctx); compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label, cctx);
// End :catch or :finally scope: set value in ISN_TRY instruction // End :catch or :finally scope: set value in ISN_TRY instruction
if (isn->isn_arg.try.try_catch == 0) if (isn->isn_arg.try.try_catch == 0)
isn->isn_arg.try.try_catch = instr->ga_len; isn->isn_arg.try.try_catch = instr->ga_len;
if (isn->isn_arg.try.try_finally == 0) if (isn->isn_arg.try.try_finally == 0)
isn->isn_arg.try.try_finally = instr->ga_len; isn->isn_arg.try.try_finally = instr->ga_len;
if (scope->se_u.se_try.ts_catch_label != 0) if (scope->se_u.se_try.ts_catch_label != 0)
{ {
// Last catch without match jumps here // Last catch without match jumps here
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label; isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
isn->isn_arg.jump.jump_where = instr->ga_len; isn->isn_arg.jump.jump_where = instr->ga_len;
}
} }
compile_endblock(cctx); compile_endblock(cctx);
if (generate_instr(cctx, ISN_ENDTRY) == NULL) if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_ENDTRY) == NULL)
return NULL; return NULL;
return arg; return arg;
} }