commit fd77748df2ba7d5f38aab649cb630374620462d7
author Bram Moolenaar <Bram@vim.org> Wed Aug 12 19:42:01 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Aug 12 19:42:01 2020 +0200
tree 68ca76560bb073e21f773dc1eb85fb6cf0a9fe6b
parent ba60cc45e786166767ca80f3dea6236d993c7971

patch 8.2.1434: Vim9: crash when lambda uses outer function argument

Problem:    Vim9: crash when lambda uses outer function argument.
Solution:   Set the flag that the outer context is used.

src/testdir/test_vim9_expr.vim

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index d6313d3..795ea75 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1443,6 +1443,16 @@
         }
 enddef
 
+def LambdaUsingArg(x: number): func
+  return {->
+            # some comment
+            x == 1
+            # some comment
+            ||
+            x == 2
+        }
+enddef
+
 def Test_expr7_lambda()
   let La = { -> 'result'}
   assert_equal('result', La())
@@ -1481,6 +1491,9 @@
   assert_equal(true, LambdaWithComments()(2))
   assert_equal(false, LambdaWithComments()(3))
 
+  assert_equal(false, LambdaUsingArg(0)())
+  assert_equal(true, LambdaUsingArg(1)())
+
   call CheckDefFailure(["filter([1, 2], {k,v -> 1})"], 'E1069:')
 enddef
 

src/version.c

diff --git a/src/version.c b/src/version.c
index e182ea6..1100818 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1434,
+/**/
     1433,
 /**/
     1432,

src/vim9compile.c

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 87bb0e2..889a5d5 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2135,7 +2135,10 @@
 	if (gen_load)
 	    res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type);
 	if (gen_load_outer)
+	{
 	    res = generate_LOAD(cctx, ISN_LOADOUTER, idx, NULL, type);
+	    cctx->ctx_outer_used = TRUE;
+	}
     }
 
     *arg = end;