Re: Patch 8.2.2409
On 26-Jan-2021 07:02, Bram Moolenaar wrote: Patch 8.2.2409 Problem:Vim9: profiling only works for one function. Solution: Select the right instructions when calling and returning. (closes #7743) Files: src/vim9compile.c, src/vim9execute.c, src/vim9.h, src/testdir/test_profile.vim After this patch, mingw64 (gcc 10.2), spits out this if FEAT_PROFILE is not defined: gcc -c -I. -Iproto -DWIN32 -DWINVER=0x0603 -D_WIN32_WINNT=0x0603 -DHAVE_PATHDEF -DFEAT_NORMAL -DHAVE_STDINT_H -D__USE_MINGW_ANSI_STDIO -pipe -march=native -Wall -O3 -fomit-frame-pointer -freg-struct-return -fpie -fPIE -DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD vim9compile.c -o gobjnative/vim9compile.o In file included from d:\users\john\documents\software\mingw\mingw64\x86_64-w64-mingw32\include\windef.h:9, from d:\users\john\documents\software\mingw\mingw64\x86_64-w64-mingw32\include\windows.h:69, from os_win32.h:95, from vim.h:262, from vim9compile.c:15: vim9compile.c: In function 'generate_CALL': vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9compile.c:1778:34: note: in expansion of macro 'PROFILING' 1778 | if (func_needs_compiling(ufunc, PROFILING(ufunc)) | ^ vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9compile.c:1780:13: note: in expansion of macro 'PROFILING' 1780 | PROFILING(ufunc), NULL) == FAIL) | ^ vim9compile.c: In function 'generate_funcref': vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9compile.c:2618:37: note: in expansion of macro 'PROFILING' 2618 | if (func_needs_compiling(ufunc, PROFILING(ufunc)) | ^ vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9compile.c:2619:43: note: in expansion of macro 'PROFILING' 2619 | && compile_def_function(ufunc, TRUE, PROFILING(ufunc), NULL) | ^ vim9compile.c: In function 'compile_lambda': vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9compile.c:3114:39: note: in expansion of macro 'PROFILING' 3114 | compile_def_function(ufunc, TRUE, PROFILING(ufunc), cctx); | ^ vim9compile.c: In function 'compile_nested_function': vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9compile.c:5091:37: note: in expansion of macro 'PROFILING' 5091 | if (func_needs_compiling(ufunc, PROFILING(ufunc)) | ^ vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9compile.c:5092:43: note: in expansion of macro 'PROFILING' 5092 | && compile_def_function(ufunc, TRUE, PROFILING(ufunc), cctx) | ^ make: *** [Make_cyg_ming.mak:1145: gobjnative/vim9compile.o] Error 1 and this: gcc -c -I. -Iproto -DWIN32 -DWINVER=0x0603 -D_WIN32_WINNT=0x0603 -DHAVE_PATHDEF -DFEAT_NORMAL -DHAVE_STDINT_H -D__USE_MINGW_ANSI_STDIO -pipe -march=native -Wall -O3 -fomit-frame-pointer -freg-struct-return -fpie -fPIE -DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD vim9execute.c -o gobjnative/vim9execute.o In file included from d:\users\john\documents\software\mingw\mingw64\x86_64-w64-mingw32\include\windef.h:9, from d:\users\john\documents\software\mingw\mingw64\x86_64-w64-mingw32\include\windows.h:69, from os_win32.h:95, from vim.h:262, from vim9execute.c:15: vim9execute.c: In function 'call_def_function': vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9execute.c:1161:38: note: in expansion of macro 'PROFILING' 1161 | || (func_needs_compiling(ufunc, PROFILING(ufunc)) | ^ vim9.h:418:20: error: called object is not a function or function pointer 418 | # define PROFILING FALSE | ^ vim9execute.c:1162:41: note: in expansion of macro 'PROFILING' 1162 | && compile_def_function(ufunc, FALSE, PROFILING(ufunc), NULL) | ^ make: *** [Make_cyg_ming.mak:1145: gobjnative/vim9execute.o] Error 1 The attached patch
Patch 8.2.2409
Patch 8.2.2409
Problem:Vim9: profiling only works for one function.
Solution: Select the right instructions when calling and returning.
(closes #7743)
Files: src/vim9compile.c, src/vim9execute.c, src/vim9.h,
src/testdir/test_profile.vim
*** ../vim-8.2.2408/src/vim9compile.c 2021-01-24 21:30:45.214803823 +0100
--- src/vim9compile.c 2021-01-25 20:54:04.799091117 +0100
***
*** 1775,1783
return FAIL;
}
}
! if (func_needs_compiling(ufunc, cctx->ctx_profiling)
&& compile_def_function(ufunc, ufunc->uf_ret_type == NULL,
! cctx->ctx_profiling, NULL) == FAIL)
return FAIL;
}
--- 1775,1783
return FAIL;
}
}
! if (func_needs_compiling(ufunc, PROFILING(ufunc))
&& compile_def_function(ufunc, ufunc->uf_ret_type == NULL,
! PROFILING(ufunc), NULL) == FAIL)
return FAIL;
}
***
*** 2615,2622
return FAIL;
// Need to compile any default values to get the argument types.
! if (func_needs_compiling(ufunc, cctx->ctx_profiling)
! && compile_def_function(ufunc, TRUE, cctx->ctx_profiling, NULL)
== FAIL)
return FAIL;
return generate_PUSHFUNC(cctx, ufunc->uf_name, ufunc->uf_func_type);
--- 2615,2622
return FAIL;
// Need to compile any default values to get the argument types.
! if (func_needs_compiling(ufunc, PROFILING(ufunc))
! && compile_def_function(ufunc, TRUE, PROFILING(ufunc), NULL)
== FAIL)
return FAIL;
return generate_PUSHFUNC(cctx, ufunc->uf_name, ufunc->uf_func_type);
***
*** 3111,3117
clear_tv();
// Compile the function into instructions.
! compile_def_function(ufunc, TRUE, cctx->ctx_profiling, cctx);
clear_evalarg(, NULL);
--- 3111,3117
clear_tv();
// Compile the function into instructions.
! compile_def_function(ufunc, TRUE, PROFILING(ufunc), cctx);
clear_evalarg(, NULL);
***
*** 5088,5095
r = eap->skip ? OK : FAIL;
goto theend;
}
! if (func_needs_compiling(ufunc, cctx->ctx_profiling)
! && compile_def_function(ufunc, TRUE, cctx->ctx_profiling, cctx)
== FAIL)
{
func_ptr_unref(ufunc);
--- 5088,5095
r = eap->skip ? OK : FAIL;
goto theend;
}
! if (func_needs_compiling(ufunc, PROFILING(ufunc))
! && compile_def_function(ufunc, TRUE, PROFILING(ufunc), cctx)
== FAIL)
{
func_ptr_unref(ufunc);
*** ../vim-8.2.2408/src/vim9execute.c 2021-01-24 20:51:56.784245253 +0100
--- src/vim9execute.c 2021-01-25 21:00:54.689995350 +0100
***
*** 181,186
--- 181,196
return FAIL;
}
+ #ifdef FEAT_PROFILE
+ // Profiling might be enabled/disabled along the way. This should not
+ // fail, since the function was compiled before and toggling profiling
+ // doesn't change any errors.
+ if (func_needs_compiling(ufunc, PROFILING(ufunc))
+ && compile_def_function(ufunc, FALSE, PROFILING(ufunc), NULL)
+ == FAIL)
+ return FAIL;
+ #endif
+
if (ufunc->uf_va_name != NULL)
{
// Need to make a list out of the vararg arguments.
***
*** 293,299
// Set execution state to the start of the called function.
ectx->ec_dfunc_idx = cdf_idx;
! ectx->ec_instr = dfunc->df_instr;
entry = estack_push_ufunc(ufunc, 1);
if (entry != NULL)
{
--- 303,309
// Set execution state to the start of the called function.
ectx->ec_dfunc_idx = cdf_idx;
! ectx->ec_instr = INSTRUCTIONS(dfunc);
entry = estack_push_ufunc(ufunc, 1);
if (entry != NULL)
{
***
*** 542,548
ectx->ec_frame_idx = STACK_TV(ectx->ec_frame_idx
+ STACK_FRAME_IDX_OFF)->vval.v_number;
dfunc = ((dfunc_T *)def_functions.ga_data) + ectx->ec_dfunc_idx;
! ectx->ec_instr = dfunc->df_instr;
if (ret_idx > 0)
{
--- 552,558
ectx->ec_frame_idx = STACK_TV(ectx->ec_frame_idx
+ STACK_FRAME_IDX_OFF)->vval.v_number;
dfunc = ((dfunc_T *)def_functions.ga_data) + ectx->ec_dfunc_idx;
! ectx->ec_ins
