patch 8.2.2263: Vim9: compilation error with try-catch in skipped block
Problem: Vim9: compilation error with try-catch in skipped block.
Solution: Do not bail out when generate_instr() returns NULL. (closes #7584)
diff --git a/src/vim9compile.c b/src/vim9compile.c
index d44fe48..045061e 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -6916,11 +6916,14 @@
if (try_scope == NULL)
return NULL;
- // "catch" is set when the first ":catch" is found.
- // "finally" is set when ":finally" or ":endtry" is found
- try_scope->se_u.se_try.ts_try_label = instr->ga_len;
- if (generate_instr(cctx, ISN_TRY) == NULL)
- return NULL;
+ if (cctx->ctx_skip != SKIP_YES)
+ {
+ // "catch" is set when the first ":catch" is found.
+ // "finally" is set when ":finally" or ":endtry" is found
+ 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 = new_scope(cctx, BLOCK_SCOPE);
@@ -6959,20 +6962,23 @@
return NULL;
}
- // Jump from end of previous block to :finally or :endtry
- 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)
+ if (cctx->ctx_skip != SKIP_YES)
{
- // 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;
+ // Jump from end of previous block to :finally or :endtry
+ 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
+ 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);
@@ -7019,7 +7025,7 @@
return NULL;
}
- if (generate_instr(cctx, ISN_CATCH) == NULL)
+ if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_CATCH) == NULL)
return NULL;
if (new_scope(cctx, BLOCK_SCOPE) == NULL)
@@ -7097,33 +7103,37 @@
return NULL;
}
- 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_finally == 0)
+ if (cctx->ctx_skip != SKIP_YES)
{
- emsg(_(e_missing_catch_or_finally));
- return NULL;
- }
+ 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_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
- // by ":finally".
- compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label, cctx);
+ // Fill in the "end" label in jumps at the end of the blocks, if not
+ // done by ":finally".
+ 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
- if (isn->isn_arg.try.try_catch == 0)
- isn->isn_arg.try.try_catch = instr->ga_len;
- if (isn->isn_arg.try.try_finally == 0)
- isn->isn_arg.try.try_finally = instr->ga_len;
+ // End :catch or :finally scope: set value in ISN_TRY instruction
+ if (isn->isn_arg.try.try_catch == 0)
+ isn->isn_arg.try.try_catch = instr->ga_len;
+ if (isn->isn_arg.try.try_finally == 0)
+ isn->isn_arg.try.try_finally = instr->ga_len;
- if (scope->se_u.se_try.ts_catch_label != 0)
- {
- // Last 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;
+ if (scope->se_u.se_try.ts_catch_label != 0)
+ {
+ // Last 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;
+ }
}
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 arg;
}