patch 8.2.2516: test failure on s390
Problem: Test failure on s390. (analyses by James McCoy)
Solution: Only set the try_finally label when not skipping.
diff --git a/src/version.c b/src/version.c
index f856d83..c3b73a5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2516,
+/**/
2515,
/**/
2514,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 5742123..6d0a748 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7719,17 +7719,21 @@
compile_endblock(cctx);
- if (try_isn->isn_arg.try.try_finally == 0)
- // No :finally encountered, use the try_finaly field to point to
- // ENDTRY, so that TRYCONT can jump there.
- try_isn->isn_arg.try.try_finally = cctx->ctx_instr.ga_len;
+ if (cctx->ctx_skip != SKIP_YES)
+ {
+ if (try_isn->isn_arg.try.try_finally == 0)
+ // No :finally encountered, use the try_finaly field to point to
+ // ENDTRY, so that TRYCONT can jump there.
+ try_isn->isn_arg.try.try_finally = instr->ga_len;
- if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_ENDTRY) == NULL)
- return NULL;
+ if (cctx->ctx_skip != SKIP_YES
+ && generate_instr(cctx, ISN_ENDTRY) == NULL)
+ return NULL;
#ifdef FEAT_PROFILE
if (cctx->ctx_profiling)
generate_instr(cctx, ISN_PROF_START);
#endif
+ }
return arg;
}