Patch 8.2.2516

[Bram Moolenaar]

Patch 8.2.2516
Problem: Test failure on s390. (analyses by James McCoy)
Solution: Only set the try_finally label when not skipping.
Files: src/vim9compile.c


*** ../vim-8.2.2515/src/vim9compile.c 2021-02-13 15:02:43.063505534 +0100
--- src/vim9compile.c 2021-02-14 16:30:29.854003081 +0100
***************
*** 7719,7735 ****

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 && generate_instr(cctx, ISN_ENDTRY) == NULL)
! return NULL;
#ifdef FEAT_PROFILE
if (cctx->ctx_profiling)
generate_instr(cctx, ISN_PROF_START);
#endif
return arg;
}

--- 7719,7739 ----

compile_endblock(cctx);

! 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;
#ifdef FEAT_PROFILE
if (cctx->ctx_profiling)
generate_instr(cctx, ISN_PROF_START);
#endif
+ }
return arg;
}

*** ../vim-8.2.2515/src/version.c 2021-02-14 15:37:26.957614290 +0100
--- src/version.c 2021-02-14 16:33:01.281667009 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2516,
/**/

--
5 out of 4 people have trouble with fractions.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///