Mercurial > vim

diff src/vim9compile.c @ 23360:eb7d8f39363c v8.2.2223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2223: Vim9: Reloading marks a :def function as deleted Commit: https://github.com/vim/vim/commit/cdc40c43f1008bda2f173d3a13606236679e8067 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 26 17:43:08 2020 +0100 patch 8.2.2223: Vim9: Reloading marks a :def function as deleted Problem: Vim9: Reloading marks a :def function as deleted. Solution: Clear the function contents but keep the index.
author Bram Moolenaar <Bram@vim.org>
date Sat, 26 Dec 2020 17:45:03 +0100
parents 37118deff718
children f181fe2150ab
line wrap: on
line diff
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -145,7 +145,7 @@ struct cctx_S {
     int		ctx_has_cmdmod;	    // ISN_CMDMOD was generated
 };
 
-static void delete_def_function_contents(dfunc_T *dfunc);
+static void delete_def_function_contents(dfunc_T *dfunc, int mark_deleted);
 
 /*
  * Lookup variable "name" in the local scope and return it in "lvar".
@@ -7498,12 +7498,12 @@ compile_def_function(ufunc_T *ufunc, int
     int		new_def_function = FALSE;
 
     // When using a function that was compiled before: Free old instructions.
-    // Otherwise add a new entry in "def_functions".
+    // The index is reused.  Otherwise add a new entry in "def_functions".
     if (ufunc->uf_dfunc_idx > 0)
     {
 	dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
 							 + ufunc->uf_dfunc_idx;
-	delete_def_function_contents(dfunc);
+	delete_def_function_contents(dfunc, FALSE);
     }
     else
     {
@@ -8344,7 +8344,7 @@ delete_instr(isn_T *isn)
  * Free all instructions for "dfunc" except df_name.
  */
     static void
-delete_def_function_contents(dfunc_T *dfunc)
+delete_def_function_contents(dfunc_T *dfunc, int mark_deleted)
 {
     int idx;
 
@@ -8355,9 +8355,13 @@ delete_def_function_contents(dfunc_T *df
 	for (idx = 0; idx < dfunc->df_instr_count; ++idx)
 	    delete_instr(dfunc->df_instr + idx);
 	VIM_CLEAR(dfunc->df_instr);
-    }
-
-    dfunc->df_deleted = TRUE;
+	dfunc->df_instr = NULL;
+    }
+
+    if (mark_deleted)
+	dfunc->df_deleted = TRUE;
+    if (dfunc->df_ufunc != NULL)
+	dfunc->df_ufunc->uf_def_status = UF_NOT_COMPILED;
 }
 
 /*
@@ -8374,7 +8378,7 @@ unlink_def_function(ufunc_T *ufunc)
 							 + ufunc->uf_dfunc_idx;
 
 	if (--dfunc->df_refcount <= 0)
-	    delete_def_function_contents(dfunc);
+	    delete_def_function_contents(dfunc, TRUE);
 	ufunc->uf_def_status = UF_NOT_COMPILED;
 	ufunc->uf_dfunc_idx = 0;
 	if (dfunc->df_ufunc == ufunc)
@@ -8410,7 +8414,7 @@ free_def_functions(void)
     {
 	dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) + idx;
 
-	delete_def_function_contents(dfunc);
+	delete_def_function_contents(dfunc, TRUE);
 	vim_free(dfunc->df_name);
     }