From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 22 Feb 2021 21:45:10 +0000 (+0100)
Subject: patch 8.2.2543: Vim9: a return inside try/catch does not restore properly
X-Git-Tag: v8.2.2543
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cb577a68277d46cc1134ef1723e90ff5f1d1b5c;p=vim

patch 8.2.2543: Vim9: a return inside try/catch does not restore properly

Problem:    Vim9: a return inside try/catch does not restore exception state
            properly.
Solution:   When there is no ":finally" jump to ":endtry". (closes #7882)
---

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 0fb09fd81..a262bcb62 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -589,6 +589,18 @@ def Test_try_catch_throw()
   assert_equal(4, ReturnInFinally())
 enddef
 
+def Test_nocatch_return_in_try()
+  # return in try block returns normally
+  def ReturnInTry(): string
+    try
+      return '"some message"'
+    catch
+    endtry
+    return 'not reached'
+  enddef
+  exe 'echoerr ' .. ReturnInTry()
+enddef
+
 def Test_cnext_works_in_catch()
   var lines =<< trim END
       vim9script
diff --git a/src/version.c b/src/version.c
index 757a14dfd..235e34492 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2543,
 /**/
     2542,
 /**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index d2cc62f9a..232f0471e 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2517,11 +2517,13 @@ call_def_function(
 			trycmd = ((trycmd_T *)trystack->ga_data)
 							+ trystack->ga_len - 1;
 		    if (trycmd != NULL
-				  && trycmd->tcd_frame_idx == ectx.ec_frame_idx
-				  && trycmd->tcd_finally_idx != 0)
+				 && trycmd->tcd_frame_idx == ectx.ec_frame_idx)
 		    {
-			// jump to ":finally" once
-			ectx.ec_iidx = trycmd->tcd_finally_idx;
+			// jump to ":finally" or ":endtry"
+			if (trycmd->tcd_finally_idx != 0)
+			    ectx.ec_iidx = trycmd->tcd_finally_idx;
+			else
+			    ectx.ec_iidx = trycmd->tcd_endtry_idx;
 			trycmd->tcd_return = TRUE;
 		    }
 		    else