Skip to content

Commit 4afa774

Browse files
committed
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.
1 parent 6281815 commit 4afa774

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2516,
753755
/**/
754756
2515,
755757
/**/

src/vim9compile.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7719,17 +7719,21 @@ compile_endtry(char_u *arg, cctx_T *cctx)
77197719

77207720
compile_endblock(cctx);
77217721

7722-
if (try_isn->isn_arg.try.try_finally == 0)
7723-
// No :finally encountered, use the try_finaly field to point to
7724-
// ENDTRY, so that TRYCONT can jump there.
7725-
try_isn->isn_arg.try.try_finally = cctx->ctx_instr.ga_len;
7722+
if (cctx->ctx_skip != SKIP_YES)
7723+
{
7724+
if (try_isn->isn_arg.try.try_finally == 0)
7725+
// No :finally encountered, use the try_finaly field to point to
7726+
// ENDTRY, so that TRYCONT can jump there.
7727+
try_isn->isn_arg.try.try_finally = instr->ga_len;
77267728

7727-
if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_ENDTRY) == NULL)
7728-
return NULL;
7729+
if (cctx->ctx_skip != SKIP_YES
7730+
&& generate_instr(cctx, ISN_ENDTRY) == NULL)
7731+
return NULL;
77297732
#ifdef FEAT_PROFILE
77307733
if (cctx->ctx_profiling)
77317734
generate_instr(cctx, ISN_PROF_START);
77327735
#endif
7736+
}
77337737
return arg;
77347738
}
77357739

0 commit comments

Comments
 (0)