patch 8.2.2010: Vim9: compiling fails for unreachable return statement

Problem:    Vim9: compiling fails for unreachable return statement.
Solution:   Fix it. (closes #7319)

diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index 37748a1d3f1ca5f1c99953cf0073a9a673482604..06fb77b0b5128435ec44131ad634984dc8b991d2 100644 (file)
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -749,6 +749,9 @@ def Test_disassemble_const_expr()
 enddef
 
 def ReturnInIf(): string
+  if 1 < 0
+    return "maybe"
+  endif
   if g:cond
     return "yes"
   else
@@ -759,6 +762,9 @@ enddef
 def Test_disassemble_return_in_if()
   var instr = execute('disassemble ReturnInIf')
   assert_match('ReturnInIf\_s*' ..
+        'if 1 < 0\_s*' ..
+        '  return "maybe"\_s*' ..
+        'endif\_s*' ..
         'if g:cond\_s*' ..
         '0 LOADG g:cond\_s*' ..
         '1 COND2BOOL\_s*' ..

diff --git a/src/version.c b/src/version.c
index 7c8a3706aab33eefd08309de44a5f13573d4d35a..c56640dcaab1cc4ad3ed73751f7c4c8b12865189 100644 (file)
--- 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 */
+/**/
+    2010,
 /**/
     2009,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index c8fb95ec414c718feb0bf631c4f14dd6af4d7529..c5d92aa1b847c86a1892eaf5085ec60c81f7f064 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4694,21 +4694,24 @@ compile_return(char_u *arg, int set_return_type, cctx_T *cctx)
        if (compile_expr0(&p, cctx) == FAIL)
            return NULL;
 
-       stack_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
-       if (set_return_type)
-           cctx->ctx_ufunc->uf_ret_type = stack_type;
-       else
+       if (cctx->ctx_skip != SKIP_YES)
        {
-           if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID
-                   && stack_type->tt_type != VAR_VOID
-                   && stack_type->tt_type != VAR_UNKNOWN)
+           stack_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
+           if (set_return_type)
+               cctx->ctx_ufunc->uf_ret_type = stack_type;
+           else
            {
-               emsg(_(e_returning_value_in_function_without_return_type));
-               return NULL;
-           }
-           if (need_type(stack_type, cctx->ctx_ufunc->uf_ret_type, -1,
+               if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID
+                       && stack_type->tt_type != VAR_VOID
+                       && stack_type->tt_type != VAR_UNKNOWN)
+               {
+                   emsg(_(e_returning_value_in_function_without_return_type));
+                   return NULL;
+               }
+               if (need_type(stack_type, cctx->ctx_ufunc->uf_ret_type, -1,
                                                   cctx, FALSE, FALSE) == FAIL)
-               return NULL;
+                   return NULL;
+           }
        }
     }
     else
@@ -4725,8 +4728,7 @@ compile_return(char_u *arg, int set_return_type, cctx_T *cctx)
        // No argument, return zero.
        generate_PUSHNR(cctx, 0);
     }
-
-    if (generate_instr(cctx, ISN_RETURN) == NULL)
+    if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_RETURN) == NULL)
        return NULL;
 
     // "return val | endif" is possible