commit 9939f57b7f1c17a0142ebfe4f9e0b634158593e1
author Bram Moolenaar <Bram@vim.org> Wed Sep 16 22:29:52 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Sep 16 22:29:52 2020 +0200
tree 77a48188a4a88e8bdc7f697ed4f2b06ddf3f6711
parent 916911f598718bc76bc6b87ed703d2805fa49c53

patch 8.2.1700: Vim9: try/catch causes wrong value to be returned

Problem:    Vim9: try/catch causes wrong value to be returned.
Solution:   Reset tcd_return. (closes #6964)

src/testdir/test_vim9_script.vim

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index c400e82..2f1e708 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1169,6 +1169,26 @@
   assert_equal('finally', g:in_finally)
 enddef
 
+def TryOne(): number
+  try
+    return 0
+  catch
+  endtry
+  return 0
+enddef
+
+def TryTwo(n: number): string
+  try
+    let x = {}
+  catch
+  endtry
+  return 'text'
+enddef
+
+def Test_try_catch_twice()
+  assert_equal('text', TryOne()->TryTwo())
+enddef
+
 def Test_try_catch_match()
   let seq = 'a'
   try

src/version.c

diff --git a/src/version.c b/src/version.c
index e77c795..ff5534f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1700,
+/**/
     1699,
 /**/
     1698,

src/vim9execute.c

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 7c8f779..40d6193 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1922,6 +1922,7 @@
 		    trycmd->tcd_catch_idx = iptr->isn_arg.try.try_catch;
 		    trycmd->tcd_finally_idx = iptr->isn_arg.try.try_finally;
 		    trycmd->tcd_caught = FALSE;
+		    trycmd->tcd_return = FALSE;
 		}
 		break;