Patch 8.2.2988

[Bram Moolenaar]

Patch 8.2.2988
Problem: Vim9: debugger test fails.
Solution: Get the debugger instructions when needed.
Files: src/vim.h, src/vim9.h


*** ../vim-8.2.2987/src/vim.h 2021-06-13 14:01:22.756396984 +0200
--- src/vim.h 2021-06-13 15:10:36.826883698 +0200
***************
*** 1801,1806 ****
--- 1801,1807 ----
CT_DEBUG // use df_instr_debug, overrules CT_PROFILE
} compiletype_T;

+ // Keep in sync with INSTRUCTIONS().
#ifdef FEAT_PROFILE
# define COMPILE_TYPE(ufunc) (debug_break_level > 0 ? CT_DEBUG : do_profiling == PROF_YES && (ufunc)->uf_profiling ? CT_PROFILE : CT_NONE)
#else
*** ../vim-8.2.2987/src/vim9.h 2021-06-13 14:01:22.756396984 +0200
--- src/vim9.h 2021-06-13 15:14:42.221267292 +0200
***************
*** 493,502 ****
// Used for "lnum" when a range is to be taken from the stack and "!" is used.
#define LNUM_VARIABLE_RANGE_ABOVE -888

#ifdef FEAT_PROFILE
# define INSTRUCTIONS(dfunc) \
! ((do_profiling == PROF_YES && (dfunc->df_ufunc)->uf_profiling) \
! ? (dfunc)->df_instr_prof : (dfunc)->df_instr)
#else
! # define INSTRUCTIONS(dfunc) ((dfunc)->df_instr)
#endif
--- 493,509 ----
// Used for "lnum" when a range is to be taken from the stack and "!" is used.
#define LNUM_VARIABLE_RANGE_ABOVE -888

+ // Keep in sync with COMPILE_TYPE()
#ifdef FEAT_PROFILE
# define INSTRUCTIONS(dfunc) \
! (debug_break_level > 0 \
! ? (dfunc)->df_instr_debug \
! : ((do_profiling == PROF_YES && (dfunc->df_ufunc)->uf_profiling) \
! ? (dfunc)->df_instr_prof \
! : (dfunc)->df_instr))
#else
! # define INSTRUCTIONS(dfunc) \
! (debug_break_level > 0 \
! ? (dfunc)->df_instr_debug \
! : (dfunc)->df_instr)
#endif
*** ../vim-8.2.2987/src/version.c 2021-06-13 14:33:16.411820418 +0200
--- src/version.c 2021-06-13 15:15:32.788969443 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2988,
/**/

--
|

Ceci n'est pas une pipe.

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