diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-18 16:35:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-18 16:35:02 +0100 |
| commit | 8e02faf4e903e33e41961ba042bb5146213813a5 (patch) | |
| tree | e9bb3ee054bd7a1291b2fd2d5e822a6d6f8c98d4 | |
| parent | 382319211a96adce089673c80eda982cc5259d0d (diff) | |
patch 8.2.2010: Vim9: compiling fails for unreachable return statementv8.2.2010
Problem: Vim9: compiling fails for unreachable return statement.
Solution: Fix it. (closes #7319)
| -rw-r--r-- | src/testdir/test_vim9_disassemble.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 30 |
3 files changed, 24 insertions, 14 deletions
diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim index 37748a1d3f..06fb77b0b5 100644 --- 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 7c8a3706aa..c56640dcaa 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2010, +/**/ 2009, /**/ 2008, diff --git a/src/vim9compile.c b/src/vim9compile.c index c8fb95ec41..c5d92aa1b8 100644 --- 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 |