patch 9.0.2044: Vim9: exceptions confuse defered functions

Problem:  Vim9: exceptions confuse defered functions
Solution: save and restore exception state when calling defered
          functions

closes: #13364
closes: #13372

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>

diff --git a/src/testdir/test_user_func.vim b/src/testdir/test_user_func.vim
index 82b5f91c6b5dc3b9bd65fa58d7508a211902ef25..8fc82c4e38264976616d45d60dfc76bbde0bae55 100644 (file)
--- a/src/testdir/test_user_func.vim
+++ b/src/testdir/test_user_func.vim
@@ -870,5 +870,31 @@ func Test_defer_wrong_arguments()
   call v9.CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got number')
 endfunc
 
+" Test for calling a deferred function after an exception
+func Test_defer_after_exception()
+  let g:callTrace = []
+  func Defer()
+    let g:callTrace += ['a']
+    let g:callTrace += ['b']
+    let g:callTrace += ['c']
+    let g:callTrace += ['d']
+  endfunc
+
+  func Foo()
+    defer Defer()
+    throw "TestException"
+  endfunc
+
+  try
+    call Foo()
+  catch /TestException/
+    let g:callTrace += ['e']
+  endtry
+  call assert_equal(['a', 'b', 'c', 'd', 'e'], g:callTrace)
+
+  delfunc Defer
+  delfunc Foo
+  unlet g:callTrace
+endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index a16c5ae19841349b558b693e38d7a31dd29a6f16..f8280c6d289854f04469022b6513ba597405ac35 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -4686,6 +4686,35 @@ def Test_refer_funcref_instr_after_realloc()
   v9.CheckScriptSuccess(lines)
 enddef
 
+" Test for calling a deferred function after an exception
+def Test_defer_after_exception()
+  var lines =<< trim END
+    vim9script
+
+    var callTrace: list<string> = []
+    def Defer()
+      callTrace += ['a']
+      callTrace += ['b']
+      callTrace += ['c']
+      callTrace += ['d']
+    enddef
+
+    def Foo()
+      defer Defer()
+      throw "TestException"
+    enddef
+
+    try
+      Foo()
+    catch /TestException/
+      callTrace += ['e']
+    endtry
+
+    assert_equal(['a', 'b', 'c', 'd', 'e'], callTrace)
+  END
+  v9.CheckScriptSuccess(lines)
+enddef
+
 " Keep this last, it messes up highlighting.
 def Test_substitute_cmd()
   new

diff --git a/src/userfunc.c b/src/userfunc.c
index a3b8bdc103ec7438c56e9fb99849f5b8096d087a..092b3927b5b7cfb8dd28cfe15a74835d56fb66f9 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -6251,8 +6251,23 @@ handle_defer_one(funccall_T *funccal)
        char_u *name = dr->dr_name;
        dr->dr_name = NULL;
 
+       // If the deferred function is called after an exception, then only the
+       // first statement in the function will be executed.  Save and restore
+       // the try/catch/throw exception state.
+       int save_trylevel = trylevel;
+       int save_did_throw = did_throw;
+       int save_need_rethrow = need_rethrow;
+
+       trylevel = 0;
+       did_throw = FALSE;
+       need_rethrow = FALSE;
+
        call_func(name, -1, &rettv, dr->dr_argcount, dr->dr_argvars, &funcexe);
 
+       trylevel = save_trylevel;
+       did_throw = save_did_throw;
+       need_rethrow = save_need_rethrow;
+
        clear_tv(&rettv);
        vim_free(name);
        for (int i = dr->dr_argcount - 1; i >= 0; --i)

diff --git a/src/version.c b/src/version.c
index bad07e6446f3f60abd54def27f375ca3c7cc2105..6a820828bf4f02d6762fa0e5106cbb8fe71d8235 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2044,
 /**/
     2043,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 1fdff84da7112b6b48732e6b8005041197863be8..dd3d263b523bbf320df67c7924bf768b42b15f48 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1140,8 +1140,23 @@ invoke_defer_funcs(ectx_T *ectx)
        char_u *name = functv->vval.v_string;
        functv->vval.v_string = NULL;
 
+       // If the deferred function is called after an exception, then only the
+       // first statement in the function will be executed.  Save and restore
+       // the try/catch/throw exception state.
+       int save_trylevel = trylevel;
+       int save_did_throw = did_throw;
+       int save_need_rethrow = need_rethrow;
+
+       trylevel = 0;
+       did_throw = FALSE;
+       need_rethrow = FALSE;
+
        (void)call_func(name, -1, &rettv, argcount, argvars, &funcexe);
 
+       trylevel = save_trylevel;
+       did_throw = save_did_throw;
+       need_rethrow = save_need_rethrow;
+
        clear_tv(&rettv);
        vim_free(name);
     }