Patch 8.2.2509

5 views
Skip to first unread message

Bram Moolenaar

unread,
Feb 13, 2021, 12:33:57 PM2/13/21
to vim...@googlegroups.com

Patch 8.2.2509
Problem: Tests fail on s390 build.
Solution: Initialize trycmd_T.
Files: src/vim9execute.c


*** ../vim-8.2.2508/src/vim9execute.c 2021-02-13 15:02:43.063505534 +0100
--- src/vim9execute.c 2021-02-13 18:31:20.065174544 +0100
***************
*** 2563,2574 ****
+ ectx.ec_trystack.ga_len;
++ectx.ec_trystack.ga_len;
++trylevel;
trycmd->tcd_frame_idx = ectx.ec_frame_idx;
trycmd->tcd_stack_len = ectx.ec_stack.ga_len;
trycmd->tcd_catch_idx = iptr->isn_arg.try.try_catch;
trycmd->tcd_finally_idx = iptr->isn_arg.try.try_finally;
- trycmd->tcd_caught = FALSE;
- trycmd->tcd_return = FALSE;
}
break;

--- 2563,2573 ----
+ ectx.ec_trystack.ga_len;
++ectx.ec_trystack.ga_len;
++trylevel;
+ CLEAR_POINTER(trycmd);
trycmd->tcd_frame_idx = ectx.ec_frame_idx;
trycmd->tcd_stack_len = ectx.ec_stack.ga_len;
trycmd->tcd_catch_idx = iptr->isn_arg.try.try_catch;
trycmd->tcd_finally_idx = iptr->isn_arg.try.try_finally;
}
break;

***************
*** 2670,2676 ****
--ectx.ec_stack.ga_len;
clear_tv(STACK_TV_BOT(0));
}
! if (trycmd->tcd_cont)
// handling :continue: jump to outer try block or
// start of the loop
ectx.ec_iidx = trycmd->tcd_cont;
--- 2669,2675 ----
--ectx.ec_stack.ga_len;
clear_tv(STACK_TV_BOT(0));
}
! if (trycmd->tcd_cont != 0)
// handling :continue: jump to outer try block or
// start of the loop
ectx.ec_iidx = trycmd->tcd_cont;
*** ../vim-8.2.2508/src/version.c 2021-02-13 18:24:19.326118995 +0100
--- src/version.c 2021-02-13 18:32:22.485033356 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2509,
/**/

--
ARTHUR: What?
BLACK KNIGHT: None shall pass.
ARTHUR: I have no quarrel with you, good Sir knight, but I must cross
this bridge.
BLACK KNIGHT: Then you shall die.
The Quest for the Holy Grail (Monty Python)

/// 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 ///
Reply all
Reply to author
Forward
0 new messages