1
0
forked from aniani/vim

patch 8.2.3003: Vim9: closure compiled with wrong compile type

Problem:    Vim9: closure compiled with wrong compile type.
Solution:   Use COMPILE_TYPE() when calling a function. (closes #8384)
This commit is contained in:
Bram Moolenaar
2021-06-15 19:32:40 +02:00
parent affd0bc626
commit 968a5b62ff
3 changed files with 30 additions and 5 deletions

View File

@@ -932,6 +932,33 @@ func Test_Backtrace_DefFunction()
call delete('Xtest2.vim') call delete('Xtest2.vim')
endfunc endfunc
func Test_debug_def_function()
CheckCWD
let file =<< trim END
vim9script
def g:Func()
var n: number
def Closure(): number
return n + 3
enddef
n += Closure()
echo 'result: ' .. n
enddef
END
call writefile(file, 'Xtest.vim')
let buf = RunVimInTerminal('-S Xtest.vim', {})
call RunDbgCmd(buf,
\ ':debug call Func()',
\ ['cmd: call Func()'])
call RunDbgCmd(buf, 'next', ['result: 3'])
call term_sendkeys(buf, "\r")
call StopVimInTerminal(buf)
call delete('Xtest.vim')
endfunc
func Test_debug_backtrace_level() func Test_debug_backtrace_level()
CheckCWD CheckCWD
let lines =<< trim END let lines =<< trim END

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3003,
/**/ /**/
3002, 3002,
/**/ /**/

View File

@@ -752,12 +752,8 @@ call_ufunc(
int error; int error;
int idx; int idx;
int did_emsg_before = did_emsg; int did_emsg_before = did_emsg;
compiletype_T compile_type = CT_NONE; compiletype_T compile_type = COMPILE_TYPE(ufunc);
#ifdef FEAT_PROFILE
if (do_profiling == PROF_YES && ufunc->uf_profiling)
compile_type = CT_PROFILE;
#endif
if (func_needs_compiling(ufunc, compile_type) if (func_needs_compiling(ufunc, compile_type)
&& compile_def_function(ufunc, FALSE, compile_type, NULL) && compile_def_function(ufunc, FALSE, compile_type, NULL)
== FAIL) == FAIL)