Fix control flow from catch block if try block returns and catch doesn't

src/lparser.cpp

@@ -4662,6 +4662,12 @@ static void trystat (LexState *ls) {
 
   check_match(ls, TK_END, TK_PCATCH, then_line);
   leaveblock(ls->fs);
+
+  int escapelist = NO_JUMP;
+  if (!prop.empty()) {  /* try block has return statement? */
+    luaK_concat(ls->fs, &escapelist, luaK_jump(ls->fs));  /* catch block has to skip over the try-return code */
+  }
+
   luaK_patchtohere(ls->fs, econd.t);
 
   if (!prop.empty()) {  /* try block has return statement? */
@@ -4684,6 +4690,8 @@ static void trystat (LexState *ls) {
     int first = luaY_nvarstack(ls->fs);  /* first slot to be returned */
     luaK_setmultret(ls->fs, &tunpack);
     luaK_ret(ls->fs, first, LUA_MULTRET);
+
+    luaK_patchtohere(ls->fs, escapelist);
   }
 }
 

testes/pluto/basic.pluto

@@ -1857,6 +1857,17 @@ do
     end
     assert(ensure_error(error, { what = "err" }).what == "err")
 end
+do
+    -- If try block returns, catch block needs to jump over the try-return code (in case it doesn't return.)
+    local function f()
+        try
+            return error("deez")
+        catch e then
+        end
+        return true
+    end
+    assert(f() == true)
+end
 
 print "Testing compatibility."
 do