patch 8.2.3086: Vim9: breakpoint on "for" does not work
Problem: Vim9: breakpoint on "for" does not work.
Solution: Use the right line number in ISN_DEBUG. (closes #8486)
diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim
index dbf2000..bb3a246 100644
--- a/src/testdir/test_debugger.vim
+++ b/src/testdir/test_debugger.vim
@@ -1017,6 +1017,13 @@
# comment
echo "second"
enddef
+ def g:FuncForLoop()
+ eval 1
+ for i in [11, 22, 33]
+ eval i
+ endfor
+ echo "done"
+ enddef
END
call writefile(file, 'Xtest.vim')
@@ -1062,6 +1069,15 @@
call RunDbgCmd(buf, ':call FuncComment()', ['function FuncComment', 'line 2: echo "first" .. "one"'])
call RunDbgCmd(buf, ':breakadd func 3 FuncComment')
call RunDbgCmd(buf, 'cont', ['function FuncComment', 'line 5: echo "second"'])
+ call RunDbgCmd(buf, 'cont')
+
+ call RunDbgCmd(buf, ':breakadd func 2 FuncForLoop')
+ call RunDbgCmd(buf, ':call FuncForLoop()', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]'])
+ call RunDbgCmd(buf, 'echo i', ['11'])
+ call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 3: eval i'])
+ call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 4: endfor'])
+ call RunDbgCmd(buf, 'next', ['function FuncForLoop', 'line 2: for i in [11, 22, 33]'])
+ call RunDbgCmd(buf, 'echo i', ['22'])
call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
diff --git a/src/version.c b/src/version.c
index 70c1b6b..6ca650f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3086,
+/**/
3085,
/**/
3084,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 533c0b3..d074215 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7747,6 +7747,7 @@
type_T *vartype;
type_T *item_type = &t_any;
int idx;
+ int prev_lnum = cctx->ctx_prev_lnum;
p = skip_var_list(arg_start, TRUE, &var_count, &semicolon, FALSE);
if (p == NULL)
@@ -7774,7 +7775,11 @@
if (cctx->ctx_compile_type == CT_DEBUG && instr->ga_len > 0
&& ((isn_T *)instr->ga_data)[instr->ga_len - 1]
.isn_type == ISN_DEBUG)
+ {
--instr->ga_len;
+ prev_lnum = ((isn_T *)instr->ga_data)[instr->ga_len]
+ .isn_arg.debug.dbg_break_lnum;
+ }
scope = new_scope(cctx, FOR_SCOPE);
if (scope == NULL)
@@ -7934,8 +7939,15 @@
}
if (cctx->ctx_compile_type == CT_DEBUG)
+ {
+ int save_prev_lnum = cctx->ctx_prev_lnum;
+
// Add ISN_DEBUG here, so that the loop variables can be inspected.
+ // Use the prev_lnum from the ISN_DEBUG instruction removed above.
+ cctx->ctx_prev_lnum = prev_lnum;
generate_instr_debug(cctx);
+ cctx->ctx_prev_lnum = save_prev_lnum;
+ }
return arg_end;